RFR: Fix up superfluous changes against upstream

[Aleksey Shipilev]

http://cr.openjdk.java.net/~shade/shenandoah/cleanups-11/webrev.01/

This is the result of another combing through the webrev against upstream.

Testing: tier1_gc_shenandoah {fastdebug|release}, non-PCH builds, eyeballing changes against upstream

Thanks,
-Aleksey