Fix deletes potentially skipped in batches

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6115
Merge branch 'cassandra-2.0' into trunk