Fix spin loop in AtomicSortedColumns

patch by graham sanderson and benedict; reviewed by yukim for
CASSANDRA-7546
Merge branch 'cassandra-2.1' into trunk