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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default