cqlsh: fix DESCRIBE for 1.1 cfs in CQL3

patch by Aleksey Yeschenko; reviewed by Brandon Williams for
CASSANDRA-5101
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	pylib/cqlshlib/cql3handling.py