add back ScrubTest
patch by Tyler Hobbs; reviewed by jbellis for CASSANDRA-5730
Merge branch 'cassandra-2.0' into trunk