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

[maurizio.cimadamore at oracle.com]

Changeset: 3f990f6ae870
Author:    langtools
Date:      2017-04-26 11:36 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/3f990f6ae870

Automatic merge with default