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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default