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

[maurizio.cimadamore at oracle.com]

Changeset: 45f9e3a42ca3
Author:    langtools
Date:      2017-04-06 22:26 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/45f9e3a42ca3

Automatic merge with default