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

[maurizio.cimadamore at oracle.com]

Changeset: 00ed098331eb
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:35 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/00ed098331eb

Automatic merge with default