Fix NPE after dropping a keyspace

Patch by tjake; reviewed by Chris Lohfink for CASSANDRA-8332
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk