Fix errors when dropping non-existent indexes

Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7590
Merge branch 'cassandra-2.1.0' into cassandra-2.1