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

[maurizio.cimadamore at oracle.com]

Changeset: 4f679e973394
Author:    langtools
Date:      2017-04-10 23:16 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/4f679e973394

Automatic merge with default