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

[maurizio.cimadamore at oracle.com]

Changeset: 49fe3f559178
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-07-20 23:59 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/49fe3f559178

Automatic merge with default