Remove CQL2

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-5918
Post-merge fixup
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Fix typos
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Optimize single partition batch statements

patch by slebresne; reviewed by benedict for CASSANDRA-6737
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/BatchStatement.java
	src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/UpdateStatement.java
	src/java/org/apache/cassandra/db/Mutation.java
Merge branch 'cassandra-2.1' into trunk
Disallow post-query re-ordering when paging

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6722
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Merge branch 'cassandra-2.1' into trunk
Completer shall always return a collection
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix CME in SessionInfo updateProgress affecting netstats
patch by Josh McKenzie; reviewed by Tyler Hobbs for CASSANDRA-6577
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix overflow of memtable_total_space_in_mb
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6753