Add optional keyspace to DROP INDEX statement

Patch by Andrés de la Peña; review by Tyler Hobbs for CASSANDRA-7314
Merge branch 'cassandra-2.1' into trunk