Handle queries on multiple secondary index types

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