Don't check for num_tokens if vnodes disabled
Activate test for 7499
Merge branch 'master' of github.com:riptano/cassandra-dtest
Merge branch 'master' into python-driver

Conflicts:
	replace_address_test.py