Ninja: add note about CQL2 removal to CQL2 docs
Merge branch 'cassandra-2.0' into cassandra-2.1.0

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

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

Conflicts:
	doc/cql/CQL.textile
Add ALLOW FILTERING and CONTAINS to cqlsh post-6910

Patch by Robert Stupp, reviewed by brandonwilliams for CASSANDRA-7588
Merge branch 'cassandra-2.1' into trunk
Merge remote-tracking branch 'origin/trunk' into 7395
Merge branch '7395' into 7562-udf-java