revert CASSANDRA-6107, and cut max cached statements to 50k
Merge branch 'cassandra-1.2' into cassandra-2.0