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

[maurizio.cimadamore at oracle.com]

Changeset: c7f8d8de690b
Author:    langtools
Date:      2017-04-28 19:21 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/c7f8d8de690b

Automatic merge with default