hg: shenandoah/jdk9/hotspot: Do not abandon RP discovery on conc GC cancel, do that only before Full GC

[ashipile at redhat.com]

Changeset: 97f8399083e4
Author:    shade
Date:      2017-06-07 20:33 +0200
URL:       http://hg.openjdk.java.net/shenandoah/jdk9/hotspot/rev/97f8399083e4

Do not abandon RP discovery on conc GC cancel, do that only before Full GC

! src/share/vm/gc/shenandoah/shenandoahConcurrentMark.cpp
! src/share/vm/gc/shenandoah/shenandoahMarkCompact.cpp