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

[maurizio.cimadamore at oracle.com]

Changeset: e4e268cc8cd9
Author:    langtools
Date:      2017-05-11 23:02 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/e4e268cc8cd9

Automatic merge with default