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

[maurizio.cimadamore at oracle.com]

Changeset: c2f748d9363b
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-26 16:37 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/c2f748d9363b

Automatic merge with condy