modify test after CASSANDRA-7463 change
Merge branch 'cassandra-2.0' into cassandra-2.1

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