Fix possible assertion triggered in SliceFromReadCommand

patch by slebresne; reviewed by jbellis for CASSANDRA-5284
Merge branch 'cassandra-1.1' into cassandra-1.2

Conflicts:
	src/java/org/apache/cassandra/db/SliceFromReadCommand.java
Merge branch 'cassandra-1.2' into trunk