hg: jdk9/sandbox/jaxp: Merge

[pavel.rappo at oracle.com]

Changeset: c0c02bfe64da
Author:    prappo
Date:      2016-09-02 10:47 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jaxp/rev/c0c02bfe64da

Merge

- src/java.xml/share/classes/javax/xml/catalog/CatalogUriResolver.java
- src/java.xml/share/classes/javax/xml/catalog/CatalogUriResolverImpl.java