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

[maurizio.cimadamore at oracle.com]

Changeset: 96983d0f0463
Author:    langtools
Date:      2017-04-06 18:26 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/96983d0f0463

Automatic merge with default

- test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-itself.xml
- test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-left.xml
- test/javax/xml/jaxp/unittest/catalog/catalogReferCircle-right.xml