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

[maurizio.cimadamore at oracle.com]

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

Automatic merge with default