Fix RangeTombstoneTest for CASSANDRA-6640 change
Merge branch 'cassandra-2.1' into trunk