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

[maurizio.cimadamore at oracle.com]

Changeset: 3f65ac5b6b12
Author:    langtools
Date:      2017-05-05 20:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/3f65ac5b6b12

Automatic merge with default