Allow LOCAL_ONE/LOCAL_QUORUM to work with SimpleStrategy
patch by Alex Liu; reviewed by jasobrown for CASSANDRA-6238
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
Merge branch 'cassandra-2.0' into trunk
Allow restoring specific columnfamilies from archived CL
patch by Carl Yeksigian, Lyuben Todorov, and jbellis for CASSANDRA-4809
merge from 2.0
Fix counter header length shortcut logic
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix regexp
Merge branch 'cassandra-2.0' into trunk
fix minor 'logging' issues
Fix NEWS.txt
Merge branch 'cassandra-2.0' into trunk
Fix trunk NEWS.txt
cqlsh: handle 'null' as session duration

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6317
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	pylib/cqlshlib/tracing.py
Merge branch 'cassandra-2.0' into trunk
Thrift socket listen backlog (Partial resolution)
patch by Nenad Merdanovic; reviewed by Vijay for CASSANDRA-6206
Fix trying to hint timed out counter writes
patch by jbellis; reviewed by aleksey for CASSANDRA-6322
Merge branch 'cassandra-2.0' into trunk