Fix 2i lookup on collection cell names w/ some clustering columns

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-8073