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

[maurizio.cimadamore at oracle.com]

Changeset: 188c46bf37ee
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:44 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/188c46bf37ee

Automatic merge with condy