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

[maurizio.cimadamore at oracle.com]

Changeset: 5530ce217f39
Author:    langtools
Date:      2017-04-25 12:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/5530ce217f39

Automatic merge with default