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

[maurizio.cimadamore at oracle.com]

Changeset: e1e156318a0f
Author:    langtools
Date:      2017-05-04 16:41 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/e1e156318a0f

Automatic merge with condy