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
Expose thread pool metrics for the native protocol server

patch by mishail; reviewed by slebresne for CASSANDRA-6234
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Merge branch 'trunk' into work