Remove Thrift Python tests (moved to dtests since CASSANDRA-5687)
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/system/test_thrift_server.py