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

[maurizio.cimadamore at oracle.com]

Changeset: 3bcb161ea52f
Author:    langtools
Date:      2017-05-05 16:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/3bcb161ea52f

Automatic merge with condy