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

[maurizio.cimadamore at oracle.com]

Changeset: 00a4a6ba3b99
Author:    langtools
Date:      2017-05-11 01:42 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/00a4a6ba3b99

Automatic merge with default