Clean up IndexInfo on keyspace/table drops

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6924
Merge branch 'cassandra-2.1' into trunk