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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default