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

[maurizio.cimadamore at oracle.com]

Changeset: 120c3d0ba6f0
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-09 00:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/120c3d0ba6f0

Automatic merge with default