hg: amber/amber/corba: Automatic merge with constant-folding

[maurizio.cimadamore at oracle.com]

Changeset: 6f567d2db52a
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-02 00:46 +0200
URL:       http://hg.openjdk.java.net/amber/amber/corba/rev/6f567d2db52a

Automatic merge with constant-folding