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

[maurizio.cimadamore at oracle.com]

Changeset: c7ea267d5f9b
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-06-23 12:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/c7ea267d5f9b

Automatic merge with default