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

[maurizio.cimadamore at oracle.com]

Changeset: 2849a6b013aa
Author:    langtools
Date:      2017-05-12 01:27 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/2849a6b013aa

Automatic merge with default