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

[maurizio.cimadamore at oracle.com]

Changeset: a5dadd67e789
Author:    langtools
Date:      2017-05-04 16:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/a5dadd67e789

Automatic merge with condy