Fix potentially repairing with wrong nodes

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