cfid_test final
Merge branch 'python-driver' of https://github.com/riptano/cassandra-dtest into python-driver