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

[john.r.rose at oracle.com]

Changeset: 42b0a982e6d8
Author:    jrose
Date:      2017-09-03 23:44 -0700
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/42b0a982e6d8

Automatic merge with default