Fix tests post-merge
Merge branch 'cassandra-2.1' into trunk