fix for througput bits to bytes
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/streaming/StreamManager.java