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

[maurizio.cimadamore at oracle.com]

Changeset: 3ce735f91c9b
Author:    langtools
Date:      2017-04-22 02:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/3ce735f91c9b

Automatic merge with default