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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default