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

[maurizio.cimadamore at oracle.com]

Changeset: 4d997bafc461
Author:    langtools
Date:      2017-05-03 18:10 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/4d997bafc461

Automatic merge with default