Add CASSANDRA-7798 test
Merge branch 'master' into python-driver

Conflicts:
	counter_tests.py