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

[maurizio.cimadamore at oracle.com]

Changeset: 8aaddb259757
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:04 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/8aaddb259757

Automatic merge with condy