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

[maurizio.cimadamore at oracle.com]

Changeset: b2300c1fa307
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-09-01 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/b2300c1fa307

Automatic merge with default