Fix reading expired row value from row cache
patch by jbellis; reviewed by Mikhail Stepura for CASSANDRA-6325
Merge branch 'cassandra-1.2' into cassandra-2.0