hg: amber/amber/corba: Automatic merge with default

[maurizio.cimadamore at oracle.com]

Changeset: 4f85888d199e
Author:    langtools
Date:      2017-04-27 08:21 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/4f85888d199e

Automatic merge with default