Copy compaction options to make sure they are reloaded.

Patch by pauloricardomg; reviewed by marcuse for CASSANDRA-7290
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk