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

[maurizio.cimadamore at oracle.com]

Changeset: 1ce158ef8122
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-02 00:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/1ce158ef8122

Automatic merge with default