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

[maurizio.cimadamore at oracle.com]

Changeset: 8ac0c2be1e98
Author:    langtools
Date:      2017-05-05 20:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/8ac0c2be1e98

Automatic merge with default