Fix autocompletion for alter keyspace

patch by Rajanarayanan Thottuvaikkatumana; reviewed by Mikhail Stepura for CASSANDRA-8021
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt