rename store -> cfs
make testCompactionProgress less racy
Fix trying to load deleted row into row cache on startup
patch by jbellis; reviewed by dbrosius for CASSANDRA-4463
merge from 1.1
merge from 1.2