r/m unused IMeasureableMemory implementation now that CLHC is no longer an option for row cache
Merge branch 'cassandra-2.0' into trunk