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

[maurizio.cimadamore at oracle.com]

Changeset: fb421201d275
Author:    langtools
Date:      2017-05-12 01:29 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/fb421201d275

Automatic merge with condy