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

[maurizio.cimadamore at oracle.com]

Changeset: 61e624100251
Author:    langtools
Date:      2017-04-10 23:15 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/61e624100251

Automatic merge with default