fix up misapply of CASSANDRA-7964 nits
Merge branch 'cassandra-2.1' into trunk