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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default