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

[maurizio.cimadamore at oracle.com]

Changeset: 2b7c0829c57b
Author:    langtools
Date:      2017-05-05 16:03 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/2b7c0829c57b

Automatic merge with condy