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

[maurizio.cimadamore at oracle.com]

Changeset: 3a1bbf20419b
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/3a1bbf20419b

Automatic merge with condy