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

[maurizio.cimadamore at oracle.com]

Changeset: cdc747b21fc5
Author:    langtools
Date:      2017-04-13 23:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/cdc747b21fc5

Automatic merge with default