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

[maurizio.cimadamore at oracle.com]

Changeset: e7d816924094
Author:    langtools
Date:      2017-05-05 20:55 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/e7d816924094

Automatic merge with default