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

[maurizio.cimadamore at oracle.com]

Changeset: 9b71b5a9e2e2
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-09-05 12:29 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/9b71b5a9e2e2

Automatic merge with condy