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

[maurizio.cimadamore at oracle.com]

Changeset: 2096a5e71b34
Author:    langtools at sthdev02.uk.oracle.com
Date:      2017-08-11 12:50 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/2096a5e71b34

Automatic merge with default

! src/share/vm/memory/universe.cpp
! src/share/vm/runtime/vmStructs.cpp