Fix requests with skipMetadata=false returning no metadata

patch by slebresne; reviewed by thobbs for CASSANDRA-8054
Set SO_LINGER to 0 for netty
Fix counters in supercolumns during live upgrades from 1.2

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

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/CounterUpdateColumn.java
Fix merging schemas with re-dropped keyspaces

patch by Aleksey Yeschenko; reviewed by Pavel Yaskevich for
CASSANDRA-7256
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/DefsTables.java
Reduce totalBlockFor() for LOCAL_* consistency levels

patch by Nicolas Douillet; reviewed by Aleksey Yeschenko for
CASSANDRA-8058
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/service/DatacenterWriteResponseHandler.java
Fix spin loop in AtomicSortedColumns

patch by graham sanderson and benedict; reviewed by yukim for
CASSANDRA-7546
Fix handling of EXECUTE with skip_metadata=false

patch by Aleksey Yeschenko and Jake Luciani; reviewed by Sylvain
Lebresne
Fix high memory use due to tracking reads on incrementally opened sstable readers

Patch by Jake Luciani; reviewed by Jason Brown for (CASSANDRA-8066)
Create backup directories for commitlog archiving during startup

patch by Jan Karlsson, reviewed by jasobrown for CASSANDRA-8111
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
ninja fix to add null check on CommitLogArchiver startup
Merge branch 'cassandra-2.0' into cassandra-2.1
Fix autocompletion for alter keyspace

patch by Rajanarayanan Thottuvaikkatumana; reviewed by Mikhail Stepura for CASSANDRA-8021
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Validate ascii and utf8 string literals in cql queries

Patch by Tyler Hobbs; review by Aleksey Yeschenko for CASSANDRA-8101
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/transport/CBUtil.java
Avoid NPE when creating table w/ frozen sets, lists

Patch by Robert Stupp; reviewed by Tyler Hobbs for CASSANDRA-8104