make it clear we are logging two stats for MS
Avoid using row cache on 2i CFs
patch by Sam Tunnicliffe and jbellis for CASSANDRA-5732
merge from 1.2
merge from 2.0