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

[maurizio.cimadamore at oracle.com]

Changeset: da7835030ce9
Author:    langtools
Date:      2017-04-22 02:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/da7835030ce9

Automatic merge with default