replace measureDeep in key cache with custom calculation
patch by Vijay; reviewed by Jonathan Ellis for CASSANDRA-4860
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamily.java
	src/java/org/apache/cassandra/db/RowIndexEntry.java