Fix thrift range filtering w/out 2ary index lookups

Patch by Sam Tunnicliffe; review by Tyler Hobbs for CASSANDRA-7741
Merge branch 'cassandra-2.1.0' into cassandra-2.1