hg: amber/amber: Automatic merge with patterns-stage-1

[maurizio.cimadamore at oracle.com]

Changeset: f000258d6df2
Author:    mcimadamore
Date:      2019-02-08 18:58 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/f000258d6df2

Automatic merge with patterns-stage-1

- 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