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
Fix replace_address after CASSANDRA-7356 broke it

Patch by Tyler Hobbs and Marcus Eriksson; reviewed by Brandon Williams for CASSANDRA-7356
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt