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

[maurizio.cimadamore at oracle.com]

Changeset: c4cdffcd15bb
Author:    langtools
Date:      2017-03-25 03:35 +0100
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/c4cdffcd15bb

Automatic merge with default