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

[maurizio.cimadamore at oracle.com]

Changeset: 916694a3c5c5
Author:    langtools
Date:      2017-05-05 20:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/916694a3c5c5

Automatic merge with condy