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

[maurizio.cimadamore at oracle.com]

Changeset: 4ca818ec35b6
Author:    langtools
Date:      2017-04-12 08:15 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/4ca818ec35b6

Automatic merge with default