Fix CleanupTest

patch by marcuse, reviewed by jbellis for CASSANDRA-6679
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	test/unit/org/apache/cassandra/db/CleanupTest.java
Merge branch 'cassandra-2.0' into trunk