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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy