Fix user defined compaction; patch by yukim reviewed by jbellis for CASSANDRA-5118
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	CHANGES.txt