Fix CFMetaData#getColumnDefinitionFromColumnName()

patch by Sergio Bossa; reviewed by Aleksey Yeschenko for CASSANDRA-7047
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
Merge branch 'cassandra-2.1' into trunk
make sstable2json output more readable, and remove support for supercolumn json (CASSANDRA-7078)
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7078
Merge branch 'cassandra-2.1' into trunk
bump cqlsh's DEFAULT_CQLVER to 3.1.6
Merge branch 'cassandra-2.1' into trunk
bump cqlsh's DEFAULT_CQLVER to 3.1.6
Merge branch 'cassandra-2.1' into trunk
Don't shut MessagingService down when replacing a node.

Patch by brandonwilliams, reviewed by Benedict for CASSANDRA-6476
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Set JMX RMI port to 7199

Patch by Chris Lohfink, reviewed by brandonwilliams for CASSANDRA-7087
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Fix CFMetaData#getColumnDefinitionFromColumnName()

patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for
CASSANDRA-7074
Merge branch 'cassandra-1.2' into cassandra-2.0

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cache/RefCountedMemory.java
Merge branch 'cassandra-2.1' into trunk