Fix potential NPE while loading paxos state

patch by slebresne; reviewed by jbellis for CASSANDRA-6211
Merge branch 'cassandra-2.0' into trunk
6233
Avoid stack overflow on RangeTombstoneList insertion

patch by slebresne; reviewed by frousseau for CASSANDRA-6181
Update changelog
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into trunk
cqlsh: add SHOW SESSION <tracing-session> command

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6228
Merge branch 'cassandra-2.0' into trunk
fix tracing adding 2x activity instead of threadName
Merge branch 'cassandra-2.0' into trunk
Make LOCAL_ONE the default CL for hadoop
Patch by Alex Liu, reviewed by brandonwilliams for CASSANDRA-6214
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix 2.0.2 changes pending re-roll
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	CHANGES.txt
Fix AbstractRowResolver and RowDigestResolver for speculative retries

patch by Jonathan Ellis; reviewed by Aleksey Yeschenko for
CASSANDRA-6194
Merge branch 'cassandra-2.0' into trunk
Revert "Revert use of speculative retries by default for now"

This reverts commit 66fe5bdaaa1f5e22d33528c3d2313cc23e7621d8.
Merge branch 'cassandra-2.0' into trunk
Replace fragile-ish ABSC w/ TMBSC in TraceState