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

[maurizio.cimadamore at oracle.com]

Changeset: e200de90e7e3
Author:    langtools
Date:      2017-04-27 08:22 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/e200de90e7e3

Automatic merge with default