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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy