shutdown() the compaction strategy in CFS.invalidate()
Merge branch 'cassandra-1.2' into cassandra-2.0

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