Fix AssertionError when doing set element deletion

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6341
Merge branch 'cassandra-1.2' into cassandra-2.0