Fix regression from CASSANDRA-6855
Merge branch 'cassandra-2.1' into trunk