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

[maurizio.cimadamore at oracle.com]

Changeset: 5bd62a8e3044
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-05-17 11:17 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/5bd62a8e3044

Automatic merge with condy