Follow up to CASSANDRA-7719

patch by Aleksey Yeschenko; reviewed by Jake Luciani for CASSANDRA-7719
Merge branch 'cassandra-2.1' into trunk