Fix snapshot repair error on indexed tables

patch by yukim; reviewed by jbellis for CASSANDRA-8020
Merge branch 'cassandra-2.1' into trunk