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

[maurizio.cimadamore at oracle.com]

Changeset: 0069aa7a7398
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-09-08 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/0069aa7a7398

Automatic merge with condy