Fix ConcurrentModificationException in repair patch by slebresne; reviewed by jbellis for CASSANDRA-2767