hg: amber/amber: manual merge with default

[vicente.romero at oracle.com]

Changeset: 9acdc1ff686a
Author:    vromero
Date:      2019-02-08 13:56 -0500
URL:       http://hg.openjdk.java.net/amber/amber/rev/9acdc1ff686a

manual merge with default

! src/hotspot/share/classfile/classFileParser.cpp
! src/hotspot/share/classfile/classFileParser.hpp
- src/hotspot/share/code/relocInfo_ext.cpp
- src/hotspot/share/code/relocInfo_ext.hpp
- src/hotspot/share/gc/g1/collectionSetChooser.cpp
- src/hotspot/share/gc/g1/collectionSetChooser.hpp
- test/hotspot/jtreg/serviceability/dcmd/framework/TEST.properties