Fix issues w/ CONTAINS (KEY) queries on 2ary indexes

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8147
Consolidate Relation.Type and IndexExpression.Operator

Patch by Benjamin Lerer; reviewed by Tyler Hobbs for CASSANDRA-8147