Ninja: remove redundant check for null
Ninja: use equals() for Boolean comparison
Ninja: add missing string format placeholder
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
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
Swap local and global default read repair chances

patch by Aleksey Yeschenko; reviewed by Jason Brown for CASSANDRA-7320
Fix bound building for multi-column IN restrictions

Patch by Tyler Hobbs and Sylvain Lebresne as a follow up on
CASSANDRA-6875
Add conditional CREATE/DROP USER support

patch by Aleksey Yeschenko; reviewed by Tyler Hobbs for CASSANDRA-7264
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
cqlsh: Count only empty lines for a "Blank lines" warning.

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7325
Use LOCAL_ONE for non-superuser auth queries

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
Fix NPE in StreamTransferTask.createMessageForRetry()

patch by Josh McKenzie; reviewed by Aleksey Yeschenko for CASSANDRA-7323
make Shuffle client static
Make StreamSession#closeSession() idempotent

Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-7262
remove incorrect use of generics in non-generified method call
Fix infinite loop on exception while streaming

Patch by JoshuaMcKenzie; reviewed by marcuse for CASSANDRA-7330