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

[maurizio.cimadamore at oracle.com]

Changeset: 20343cb79c49
Author:    langtools
Date:      2017-05-12 01:27 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/20343cb79c49

Automatic merge with default