Fix prepared marker for collections inside UDT
patch by slebresne; reviewed by thobbs for CASSANDRA-7472
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix ClassCastException processing expired messages
patch by Jason Brown; reviewed by tjake for CASSANDRA-7496
Workaround JVM NPE on JMX bind failure
patch by Brandon Williams; reviewed by tjake for CASSANDRA-7254
merge from 2.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
ninja fix to lower the logging level of anticompaction when printing ranges
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
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