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

[maurizio.cimadamore at oracle.com]

Changeset: 444e767dc741
Author:    langtools
Date:      2017-04-13 23:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/444e767dc741

Automatic merge with default