Fixup for CASSANDRA-6914: null handling, ...

patch by slebresne; reviewed by thobbs for CASSANDRA-7155
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/ColumnCondition.java
	src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java
	src/java/org/apache/cassandra/db/marshal/CollectionType.java
	src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/MapType.java
	src/java/org/apache/cassandra/db/marshal/SetType.java
	src/java/org/apache/cassandra/serializers/CollectionSerializer.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
	src/java/org/apache/cassandra/serializers/SetSerializer.java
	test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java
Validate method for CollectionType

patch by slebresne; reviewed by thobbs for CASSANDRA-7208
Changelog fix
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Increase compaction visibility

Patch by cnlwsu; reviewed by marcuse for CASSANDRA-7242.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
Provide the correct QueryOptions when buildind CAS resultset
Always reallocate buffers with HSHA.

Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285
Switch disruptor to 0.3.5
Always reallocate buffers with HSHA.

Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285
Merge branch 'cassandra-2.0' into cassandra-2.1
Ninja: removed old cassandra-dbapi licenses. Added new one for ptyhon-driver
Ninja: thrift-server-0.3.5.jar for CASSANDRA-6285
only query once for local host id on join

patch by dbrosius reviewed by jbellis for cassandra-7257
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
fix CFSTest on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7195
remove unused field 'severity'
Merge branch 'cassandra-2.0' into cassandra-2.1