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

[maurizio.cimadamore at oracle.com]

Changeset: 5a9897d3ef80
Author:    langtools
Date:      2017-05-12 01:28 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/5a9897d3ef80

Automatic merge with constant-folding