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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default