Fix merging schemas with re-dropped keyspaces

patch by Aleksey Yeschenko; reviewed by Pavel Yaskevich for
CASSANDRA-7256