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

[maurizio.cimadamore at oracle.com]

Changeset: ed2ec1cb0ff9
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:45 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/ed2ec1cb0ff9

Automatic merge with constant-folding