Ensure CL guarantees on digest mismatch

patch by slebresne; reviewed by jbellis for CASSANDRA-5113
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/SliceFromReadCommand.java
	test/unit/org/apache/cassandra/service/RowResolverTest.java