partial backport 3569
Merge branch 'cassandra-2.0' into cassandra-2.1.0