cqlsh: Handle collections embedded into UDTs correctly.

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7267
Ninja: use equals() for Boolean comparison
Merge branch 'cassandra-2.0' into cassandra-2.1
Ninja: add missing string format placeholder
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Tuple types

patch by slebresne; reviewed by thobbs for CASSANDRA-7248
Fix bug with some IN queries missing results

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

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Ninja fix for CASSANDRA-7245
Support more concurrent requests in native protocol

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7231
Move less common tools into a new cassandra-tools package.

Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-7160
Fix availability validation for LOCAL_ONE CL

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-7319
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Swap local and global default read repair chances

patch by Aleksey Yeschenko; reviewed by Jason Brown for CASSANDRA-7320
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	NEWS.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
Fix bound building for multi-column IN restrictions

Patch by Tyler Hobbs and Sylvain Lebresne as a follow up on
CASSANDRA-6875
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	test/unit/org/apache/cassandra/cql3/MultiColumnRelationTest.java
Add conditional CREATE/DROP USER support

patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7264