Fix streaming older SSTable yields row tombstones

patch by yukim; reviewed by jbellis for CASSANDRA-6527
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java