Fix snapshots in use get deleted during snapshot repair

patch by yukim; reviewed by jbellis for CASSANDRA-6011
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/compaction/CompactionManager.java
Merge branch 'cassandra-2.0' into trunk