Clean up imports
Remove test that tracked only dbapi2 functionality
Merge branch 'python-driver' into 7163

Conflicts:
	cql_tests.py