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

[maurizio.cimadamore at oracle.com]

Changeset: be71b955031b
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/be71b955031b

Automatic merge with constant-folding