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

[maurizio.cimadamore at oracle.com]

Changeset: e8a7a6d6feac
Author:    langtools
Date:      2017-04-12 08:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/e8a7a6d6feac

Automatic merge with default