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

[maurizio.cimadamore at oracle.com]

Changeset: 20b5b9f8b656
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/20b5b9f8b656

Automatic merge with default