Ninja: update unit tests for CASSANDRA-8206
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	test/unit/org/apache/cassandra/db/RangeTombstoneTest.java
	test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java