better handling for amid compaction failure; patch by yukim reviewed by slebresne for CASSANDRA-5137
Merge branch 'cassandra-1.1' into cassandra-1.2

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