Fix repair hang when given CF does not exist

patch by yukim; reviewed by krummas for CASSANDRA-7189
Merge branch 'cassandra-2.1' into trunk