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

[maurizio.cimadamore at oracle.com]

Changeset: 34670dceab84
Author:    langtools
Date:      2017-05-05 20:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/34670dceab84

Automatic merge with condy