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

[maurizio.cimadamore at oracle.com]

Changeset: 61d6f50db171
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 10:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/61d6f50db171

Automatic merge with default