Fix CC#collectTimeOrderedData() tombstone optimisations

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-7394