Fix SecondaryIndexManager#deleteFromIndexes()

patch by Sergio Bossa; reviewed by Sam Tunnicliffe for CASSANDRA-6711
Merge branch 'cassandra-1.2' into cassandra-2.0