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

[maurizio.cimadamore at oracle.com]

Changeset: cdea1fe42397
Author:    langtools
Date:      2017-05-10 19:40 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/cdea1fe42397

Automatic merge with default