Fix snapshot repair not snapshotting coordinator

patch by yukim; reviewed by sankalp kohli for CASSANDRA-6713
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/AntiEntropyService.java
Merge branch 'cassandra-2.0' into cassandra-2.1