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

[maurizio.cimadamore at oracle.com]

Changeset: dade7d984a27
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-02 00:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/dade7d984a27

Automatic merge with default