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

[maurizio.cimadamore at oracle.com]

Changeset: e7a37f46fe57
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-21 11:47 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/e7a37f46fe57

Automatic merge with condy