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

[maurizio.cimadamore at oracle.com]

Changeset: f3362e62b115
Author:    langtools
Date:      2017-05-05 20:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jaxp/rev/f3362e62b115

Automatic merge with condy