cherry-pick CASSANDRA-5816
Merge branch 'cassandra-2.0' into trunk