Move CASSANDRA-6058 to 2.0.2
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 remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0