Don't allow marking already compacted sstables as compacting.

Patch by marcuse; reviewed by yukim for CASSANDRA-7145
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt