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

[maurizio.cimadamore at oracle.com]

Changeset: e4d6061acf16
Author:    langtools
Date:      2017-05-05 16:01 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/e4d6061acf16

Automatic merge with default