update cassandra datastore
fork 1
Merge branch '3.x-temp' into master-temp