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

[maurizio.cimadamore at oracle.com]

Changeset: 1172d0e2946e
Author:    langtools
Date:      2017-05-12 01:26 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/1172d0e2946e

Automatic merge with default

- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java
- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java
- src/java.xml/share/classes/com/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java