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

[maurizio.cimadamore at oracle.com]

Changeset: 572c5c68772f
Author:    langtools
Date:      2017-04-04 11:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/572c5c68772f

Automatic merge with default