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

[maurizio.cimadamore at oracle.com]

Changeset: 7e93bf9a6711
Author:    langtools
Date:      2017-04-10 23:15 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/7e93bf9a6711

Automatic merge with default