Mark CF clean if a mutation raced the drop and got it marked dirty
patch by jbellis; reviewed by Tyler Hobbs for CASSANDRA-5946
merge from 1.2
Merge branch 'cassandra-2.0' into trunk