Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/Memtable.java
snaptree is no longer a dependency in 2.1 and forwards
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
Serialize batchlog mutations with the version of the target node

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6931
Add missing CHANGES.txt entry for CASSANDRA-6931
Optimize CounterColumn#reconcile()

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6953
Remove 1.2 sstable support in 2.1

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6869
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1

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

Conflicts:
	src/java/org/apache/cassandra/db/BatchlogManager.java
Merge branch 'cassandra-2.0' into cassandra-2.1

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

Conflicts:
	src/java/org/apache/cassandra/db/filter/ColumnCounter.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/filter/ColumnCounter.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/config/Schema.java
	src/java/org/apache/cassandra/cql/QueryProcessor.java
	src/java/org/apache/cassandra/cql/SelectStatement.java
	src/java/org/apache/cassandra/cql/UpdateStatement.java
	src/java/org/apache/cassandra/db/Column.java
	src/java/org/apache/cassandra/thrift/ThriftValidation.java
	src/java/org/apache/cassandra/tools/SSTableExport.java
	src/java/org/apache/cassandra/tools/SSTableImport.java
	test/unit/org/apache/cassandra/SchemaLoader.java
	test/unit/org/apache/cassandra/db/ScrubTest.java
	test/unit/org/apache/cassandra/thrift/ThriftValidationTest.java
	test/unit/org/apache/cassandra/tools/SSTableExportTest.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/db/SuperColumns.java
Fix tests post-merge
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/db/marshal/CompositeType.java
	test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/ColumnCondition.java