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

[maurizio.cimadamore at oracle.com]

Changeset: 948e0fdfa3ca
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-06 23:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/948e0fdfa3ca

Automatic merge with default