Fix regression introduced by CASSANDRA-8115

Patch by Josh McKenzie, reviewed by Philip Thompson for CASSANDRA-8115
Merge branch 'cassandra-2.1' into trunk