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

[maurizio.cimadamore at oracle.com]

Changeset: b686ff11319e
Author:    langtools
Date:      2017-04-10 23:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxws/rev/b686ff11319e

Automatic merge with default