Move CASSANDRA-6058 to 2.0.2
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
Allow cache-keys-to-save to be set at runtime
patch by Chris Burroughs; reviewed by jbellis for CASSANDRA-5980
Fix comment
merge from 1.2
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge remote-tracking branch 'origin/trunk' into trunk