Fix wrong progress when streaming uncompressed

patch by yukim; reviewed by Josh McKenzie for CASSANDRA-7878
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk