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

[maurizio.cimadamore at oracle.com]

Changeset: 5630f10c9e70
Author:    langtools
Date:      2017-04-10 23:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/5630f10c9e70

Automatic merge with default