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

[maurizio.cimadamore at oracle.com]

Changeset: 69772fadc0c9
Author:    langtools
Date:      2017-05-03 18:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/69772fadc0c9

Automatic merge with default