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

[maurizio.cimadamore at oracle.com]

Changeset: 69f992b9e621
Author:    langtools
Date:      2017-04-12 00:51 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/69f992b9e621

Automatic merge with default