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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with condy