fix test, take 2
Merge branch 'cassandra-2.1' into trunk