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

[maurizio.cimadamore at oracle.com]

Changeset: f1080b829bb1
Author:    langtools
Date:      2017-04-22 02:56 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/f1080b829bb1

Automatic merge with default