Wip 236 cassandra spark upgrade

This is built off b1.1 branch and will need to be merged back to that.