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

[maurizio.cimadamore at oracle.com]

Changeset: 6a47b7805955
Author:    langtools
Date:      2017-05-05 20:57 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/6a47b7805955

Automatic merge with default