Fix error when CONTAINS is used with a bind marker

patch by slebresne; reviewed by tjake for CASSANDRA-7502
Properly reject unknown UDT fields

patch by slebresne; reviewed by tjake for CASSANDRA-7484
Shorten SSTable path

patch by yukim; reviewed by Josh McKenzie for CASSANDRA-6962
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Update SSTable decriptor version for 3.0
Fix test built
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix test built
Introduce CQL support for stress tool

patch by Jake Luciani and Benedict Elliott Smith
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	tools/stress/src/org/apache/cassandra/stress/Operation.java
	tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java
	tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java
	tools/stress/src/org/apache/cassandra/stress/operations/ThriftInserter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterAdder.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlCounterGetter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlInserter.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java
	tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlReader.java
	tools/stress/src/org/apache/cassandra/stress/settings/SettingsColumn.java
Consider expiry when reconciling otherwise equal cells

patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko
and Sylvain Lebresne for CASSANDRA-7403
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Followup for CASSANDRA-7403
Update versions and licenses for 2.1 RC3 release
fix nodetool alignment
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	debian/changelog