Fix CompositeType columns in DESCRIBE TABLE output

Patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7399
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	bin/cqlsh
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	bin/cqlsh