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

[maurizio.cimadamore at oracle.com]

Changeset: e8b012585dfe
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-23 00:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/e8b012585dfe

Automatic merge with condy