Turn MarshalException into ConfigurationException for Thrift

CFMetaData#fromThrift() and CFMetaData#fromThriftForUpdate() should
rethrow MarshalException-s as ConfigurationException-s for Thrift -
for system_update_column_family() and system_add_column_family() sake.
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
(Thrift) fix range deletion of supercolumns

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7733
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/thrift/CassandraServer.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix validation when adding static columns

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7730
Better error message when trying to add a collection with the same name than a previously dropped one
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/AlterTableStatement.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Give CRR a default input_cql Statement

Patch by Mike Adamson, reviewed by brandonwilliams for CASSANDRA-7226
Merge branch 'cassandra-2.0' into cassandra-2.1.0

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

Conflicts:
	test/system/test_thrift_server.py