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

[maurizio.cimadamore at oracle.com]

Changeset: 48e4178809ce
Author:    langtools
Date:      2017-05-05 16:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/48e4178809ce

Automatic merge with default