Fix stress smart Thrift client to pick servers correctly
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6848
Add logging levels (minimal, normal or verbose) to stress tool
patch by Benedict Elliott Smith; reviewed by Pavel Yaskevich for CASSANDRA-6849
Merge branch 'cassandra-2.1' into trunk