Fix sstablelevelresetter hang

patch by yukim; reviewed by krummas for CASSANDRA-7614
Merge branch 'cassandra-2.1.0' into cassandra-2.1