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
no need to fetch throughput if no compactions
Ignore fat clients when checking for endpoint collision

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7939
Merge branch 'cassandra-2.0' into cassandra-2.1
Ignore fat clients when checking for endpoint collision

Patch by brandonwilliams, reviewed by tjake for CASSANDRA-7939
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/trunk' into 7396-coll-slice