Remove some vestiges of the old streaming
Merge branch 'cassandra-2.0' into trunk