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

[maurizio.cimadamore at oracle.com]

Changeset: 211e4e664d25
Author:    langtools
Date:      2017-04-10 23:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/211e4e664d25

Automatic merge with default