revert CASSANDRA-6107, and cut max cached statements to 50k
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix SSTableScanner potentially skipping rows during cleanup

patch by slebresne; reviewed by thobbs for CASSANDRA-6638
Merge branch 'cassandra-2.0' into trunk