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

[maurizio.cimadamore at oracle.com]

Changeset: 193996d49f5a
Author:    langtools
Date:      2017-04-12 00:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/193996d49f5a

Automatic merge with default