Increase compaction visibility

Patch by cnlwsu; reviewed by marcuse for CASSANDRA-7242.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java