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

[maurizio.cimadamore at oracle.com]

Changeset: 47a0f696b5a8
Author:    langtools
Date:      2017-04-12 00:51 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/47a0f696b5a8

Automatic merge with default