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

[maurizio.cimadamore at oracle.com]

Changeset: 2573a1b78c8d
Author:    langtools
Date:      2017-04-25 12:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/2573a1b78c8d

Automatic merge with default