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

[maurizio.cimadamore at oracle.com]

Changeset: cd98d8e3c5ed
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-07 01:36 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/cd98d8e3c5ed

Automatic merge with condy