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

[john.r.rose at oracle.com]

Changeset: c57f1c713666
Author:    jrose
Date:      2017-09-03 23:44 -0700
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/c57f1c713666

Automatic merge with default