Backport CASSANDRA-7386
Merge branch 'cassandra-2.0' into cassandra-2.1