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

[maurizio.cimadamore at oracle.com]

Changeset: 9f6e388c837d
Author:    langtools
Date:      2017-05-03 18:11 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/9f6e388c837d

Automatic merge with default