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

[maurizio.cimadamore at oracle.com]

Changeset: 003987956f34
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-21 00:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/003987956f34

Automatic merge with default