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

[maurizio.cimadamore at oracle.com]

Changeset: 9b971ea40384
Author:    langtools
Date:      2017-05-12 01:29 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/9b971ea40384

Automatic merge with condy