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

[maurizio.cimadamore at oracle.com]

Changeset: 6d6c63a531e7
Author:    langtools
Date:      2017-05-12 01:26 +0200
URL:       http://hg.openjdk.java.net/amber/amber/hotspot/rev/6d6c63a531e7

Automatic merge with default

! src/share/vm/classfile/vmSymbols.hpp
! src/share/vm/runtime/globals.hpp