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

[maurizio.cimadamore at oracle.com]

Changeset: cdd349f792ca
Author:    langtools
Date:      2017-04-12 08:15 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/cdd349f792ca

Automatic merge with default