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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default