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

[maurizio.cimadamore at oracle.com]

Changeset: ff18112103b5
Author:    langtools
Date:      2017-04-13 06:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/ff18112103b5

Automatic merge with default