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

[maurizio.cimadamore at oracle.com]

Changeset: ce042cfd233a
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-09-05 12:29 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/ce042cfd233a

Automatic merge with condy