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

[maurizio.cimadamore at oracle.com]

Changeset: ccb25c125890
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/ccb25c125890

Automatic merge with default