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

[maurizio.cimadamore at oracle.com]

Changeset: 049856d36de1
Author:    langtools
Date:      2017-04-25 12:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/049856d36de1

Automatic merge with default