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

[maurizio.cimadamore at oracle.com]

Changeset: 35641e7a6d58
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-07 01:36 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/35641e7a6d58

Automatic merge with condy