Fix test/system/test_thrift_server.py
Merge branch 'cassandra-1.2' into cassandra-2.0