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

[maurizio.cimadamore at oracle.com]

Changeset: 1f0278bf8ab5
Author:    langtools
Date:      2017-04-22 02:57 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/1f0278bf8ab5

Automatic merge with default