Closed #286
Merge branch 'develop' of
https://github.com/cassandra-project/platform.git into develop

Conflicts:
	tests/clusterparams.json