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

[maurizio.cimadamore at oracle.com]

Changeset: bf9c92629d16
Author:    langtools
Date:      2017-05-05 16:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/bf9c92629d16

Automatic merge with default