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

[maurizio.cimadamore at oracle.com]

Changeset: 005b730a4bdd
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-17 01:07 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/005b730a4bdd

Automatic merge with condy