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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default