Fix potential NPE in 2ndary indexes

patch by slebresne; reviewed by jbellis for CASSANDRA-6098
Merge branch 'cassandra-2.0' into trunk