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
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
More efficient executor service for fast operations

Patch by Benedict Elliott Smith; reviewed by Jason Brown for CASSANDRA 4718
Revert flush directory (CASSANDRA-6357)

Patch by Jonathan Ellis; reviewed by Benedict Elliott Smith
Fix CqlPagingRecordReader on tables with few rows

Patch by Tyler Hobbs; reviewed by Brandon Williams for CASSANDRA-7322
Hint streaming can cause decommission to fail

patch by jasobrown, reviewed by marcuse for CASSANDRA-7219
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Licenses and versions in preparation of 2.1rc1 release
cqlsh: Count only empty lines for a "Blank lines" warning.

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7325
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt