hg: jdk9/jdk9/jaxp: 2 new changesets

[lana.steuck at oracle.com]

Changeset: 06299cf67046
Author:    joehw
Date:      2016-09-22 10:17 -0700
URL:       http://hg.openjdk.java.net/jdk9/jdk9/jaxp/rev/06299cf67046

8166398: CatalogSupport tests need to be fixed
Reviewed-by: dfuchs

! src/java.xml/share/classes/com/sun/org/apache/xerces/internal/impl/XMLEntityManager.java
! src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java
! test/javax/xml/jaxp/unittest/catalog/CatalogSupport.xml
! test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java
! test/javax/xml/jaxp/unittest/catalog/XI_simple4Catalog.xml
+ test/javax/xml/jaxp/unittest/catalog/XI_test2Catalog.xml

Changeset: 69c3b12ba75b
Author:    lana
Date:      2016-09-22 18:32 +0000
URL:       http://hg.openjdk.java.net/jdk9/jdk9/jaxp/rev/69c3b12ba75b

Merge