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

[maurizio.cimadamore at oracle.com]

Changeset: c3798e7128b5
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:37 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/c3798e7128b5

Automatic merge with condy