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

[maurizio.cimadamore at oracle.com]

Changeset: 3a6ce1abf6ce
Author:    langtools
Date:      2017-04-12 00:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/3a6ce1abf6ce

Automatic merge with default