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

[maurizio.cimadamore at oracle.com]

Changeset: eaaee7ea9b80
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-15 13:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/eaaee7ea9b80

Automatic merge with condy