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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default