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

[maurizio.cimadamore at oracle.com]

Changeset: 7c70460d0049
Author:    langtools
Date:      2017-05-12 01:29 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/7c70460d0049

Automatic merge with condy