Fix timestamp-based tomstone removal logic

patch by slebresne; reviewed by jbellis for CASSANDRA-5248
Merge branch 'cassandra-1.2' into trunk