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

[maurizio.cimadamore at oracle.com]

Changeset: c36bd0e29650
Author:    langtools
Date:      2017-04-25 12:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/c36bd0e29650

Automatic merge with default