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

[maurizio.cimadamore at oracle.com]

Changeset: b873069e1175
Author:    langtools
Date:      2017-05-05 20:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/b873069e1175

Automatic merge with default