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

[maurizio.cimadamore at oracle.com]

Changeset: 3b1a5a429d87
Author:    langtools
Date:      2017-04-22 02:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/3b1a5a429d87

Automatic merge with default