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

[maurizio.cimadamore at oracle.com]

Changeset: 36a2d238c995
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-14 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/36a2d238c995

Automatic merge with default