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

[maurizio.cimadamore at oracle.com]

Changeset: ed9210252468
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/ed9210252468

Automatic merge with default