apply CASSANDRA-8027 to cassandra-2.0 branch
Merge branch 'cassandra-2.0' into cassandra-2.1