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

[maurizio.cimadamore at oracle.com]

Changeset: daf9425d33f6
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-16 11:44 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/daf9425d33f6

Automatic merge with condy