Fix more of test/system/test_thrift_server.py
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix even more of test/system/test_thrift_server.py
Merge branch 'cassandra-2.0' into cassandra-2.1.0