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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy