r/m equals override
patch by jbellis; reviewed by Vijay for CASSANDRA-6712
Add flush directory distinct from compaction directories
patch by jbellis and aleksey for CASSANDRA-6357
wip
Revert 6157 until we can commit to 2.0 and merge forwards

This reverts commit f64b31c426b53c264e65180e858f0c283cf5edb2.
Split out outgoing stream throughput within a DC and inter-DC
patch by Vijay and benedict for CASSANDRA-6596
update the streaming throttle bytes to bits
Merge branch 'cassandra-2.0' into trunk

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