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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default