Retrieve the correct number of undeleted columns, if any, from a supercolumn in a row that had been deleted previously. patch by Brandon Williams and jbellis for CASSANDRA-920