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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default