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

[maurizio.cimadamore at oracle.com]

Changeset: 9ec17a5bfdd2
Author:    langtools
Date:      2017-05-12 01:27 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/9ec17a5bfdd2

Automatic merge with default