Fix test for change in CASSANDRA-6357
Merge branch 'cassandra-2.1' into trunk