Fix failing unit tests (bad CASSANDRA-7744 merge)
Merge branch 'cassandra-2.1.0' into cassandra-2.1