re-add parameter columns to tracing session

patch by dbrosius reviewed by jbellis for cassandra-6942
Merge branch 'cassandra-2.0' into cassandra-2.1
fix bad merge
Fix StorageProxy#syncWriteToBatchlog()
fix equals to compare this to the parm, rather than this to this
Preserves CQL metadata when updating table from thrift

patch by mishail; reviewed by iamaleksey & slebresne for CASSANDRA-6831
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/thrift/CassandraServer.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
	test/unit/org/apache/cassandra/config/CFMetaDataTest.java
change NBHS in ARR to CLQ
patch by bes; reviewed by jbellis for CASSANDRA-7116
switch README to asciidoc extension
wip
formatting
Merge branch 'cassandra-2.0' into cassandra-2.1
Native protocol v3

patch by slebresne; reviewed by thobbs for CASSANDRA-6855
Optimize Cell liveness checks and clean up Cell

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-7119
Fix column name in invalid constant type error msg
Ninja-fix PureJavaCrc32
Fix regression from CASSANDRA-6855
Support consistent range movements.

patch by tjake; reviewed by thobbs for CASSANDRA-2434
Update versions and add licenses for 2.1-beta2 release