Check if autocompaction should be disabled before enabling it during startup.

Patch by marcuse; reviewed by driftx for CASSANDRA-7187
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt