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

[maurizio.cimadamore at oracle.com]

Changeset: d505a54b49c4
Author:    langtools
Date:      2017-05-11 23:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/d505a54b49c4

Automatic merge with condy