backport CASSANDRA-6927 to 2.0
merge
Merge branch 'cassandra-2.1' into trunk