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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default