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

[maurizio.cimadamore at oracle.com]

Changeset: 45bced74d459
Author:    langtools
Date:      2017-04-12 00:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/jdk/rev/45bced74d459

Automatic merge with default