Remove some vestiges of the old streaming
Merge branch 'cassandra-2.0' into trunk
cqlsh: hanlde symlinks properly

patch by Yinyin L; reviewed by Aleksey Yeschenko for CASSANDRA-6425
Merge branch 'cassandra-2.0' into trunk
Merge branch 'trunk' of http://git-wip-us.apache.org/repos/asf/cassandra into trunk