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

[maurizio.cimadamore at oracle.com]

Changeset: 3c8a16e3aa14
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-09-01 00:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/3c8a16e3aa14

Automatic merge with default