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

[maurizio.cimadamore at oracle.com]

Changeset: 7e93f10c2548
Author:    langtools
Date:      2017-05-05 16:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/7e93f10c2548

Automatic merge with default