hg: jdk9/hs-rt/hotspot: 8139868: CMSScavengeBeforeRemark broken after JDK-8134953

[bengt.rutisson at oracle.com]

Changeset: 9b74c5f1b10e
Author:    brutisso
Date:      2015-10-20 14:00 +0200
URL:       http://hg.openjdk.java.net/jdk9/hs-rt/hotspot/rev/9b74c5f1b10e

8139868: CMSScavengeBeforeRemark broken after JDK-8134953
Reviewed-by: sjohanss, jwilhelm

! src/share/vm/gc/shared/gcId.cpp
! src/share/vm/gc/shared/genCollectedHeap.cpp
+ test/gc/cms/TestCMSScavengeBeforeRemark.java