Modify reconcile logic to always pick a tombstone over a counter cell

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7346
Merge branch 'cassandra-2.1' into trunk