Fix AssertionError in RangeTombstoneList diff

Patch by Philo Yang and Oleg Anastasyev; reviewed by Tyler Hobbs for
CASSANDRA-8013
Merge branch 'cassandra-2.1' into trunk