Fix race in background compaction check

patch by yukim; reviewed by krummas for CASSANDRA-7745
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1.0