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

[maurizio.cimadamore at oracle.com]

Changeset: 4d9ba25a0f2f
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:42 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/4d9ba25a0f2f

Automatic merge with default