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

[maurizio.cimadamore at oracle.com]

Changeset: f8c4066a3104
Author:    langtools
Date:      2017-03-31 19:31 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/f8c4066a3104

Automatic merge with default