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

[maurizio.cimadamore at oracle.com]

Changeset: 42172fab1149
Author:    langtools
Date:      2017-05-11 00:20 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/42172fab1149

Automatic merge with default