Handle queries on multiple secondary index types

Patch and review by Sam Tunnicliffe and Tyler Hobbs for CASSANDRA-7525