Versions update for 1.2.18
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
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
ninja fix to lower the logging level of anticompaction when printing ranges
Merge branch 'cassandra-2.1.0' into cassandra-2.1
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
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Fix test built
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Introduce CQL support for stress tool

patch by Jake Luciani and Benedict Elliott Smith
Merge branch 'cassandra-2.1.0' into cassandra-2.1
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
Followup for CASSANDRA-7403
Update versions and licenses for 2.1 RC3 release