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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/auth/CassandraAuthorizer.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt