hg: jdk9/sandbox/jaxp: Merge

[erik.joelsson at oracle.com]

Changeset: 55ff00fc9586
Author:    erikj
Date:      2016-09-15 11:00 +0200
URL:       http://hg.openjdk.java.net/jdk9/sandbox/jaxp/rev/55ff00fc9586

Merge

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