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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default