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

[maurizio.cimadamore at oracle.com]

Changeset: d122494d1502
Author:    langtools
Date:      2017-03-25 03:35 +0100
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/d122494d1502

Automatic merge with default