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

[maurizio.cimadamore at oracle.com]

Changeset: 6f923011c18a
Author:    langtools
Date:      2017-04-22 02:57 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/6f923011c18a

Automatic merge with default