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

[maurizio.cimadamore at oracle.com]

Changeset: 228baa9046ac
Author:    langtools
Date:      2017-04-13 23:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/228baa9046ac

Automatic merge with default