Fix CASSANDRA-6714 leftover issue
Merge branch 'cassandra-2.1' into trunk