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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy