(cqlsh) Fix DESCRIBE for NTS keyspaces

patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7729
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk