Fix CFMetaData#getColumnDefinitionFromColumnName()

patch by Benedict Elliott Smith; reviewed by Aleksey Yeschenko for
CASSANDRA-7074
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
remove dead local vars
Remove unused (and slightly broken) ColumnIdentifier.compareTo
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/ColumnIdentifier.java
Add back ColumnIdentifier comparison since we do use it
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/CFDefinition.java
Fix nodetool display with vnodes.

Patch by brandonwilliams, reviewed by Vijay for CASSANDRA-7082
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Plug holes in resource release when wiring up StreamSession

patch by belliotsmith; reviewed by yukim for CASSANDRA-7073
Avoid NPE when doing CFS.scrubDataDirectories
fix npe when specifying -Dcassandra.fd_initial_value_ms

patch by dbrosius reviewed by bwilliams for cassandra 6751
Merge branch 'cassandra-1.2' into cassandra-2.0
fix message spilleng
Add ability to set/get logging levels to nodetool
patch by Jackson Chung reviewed by Vijay for CASSANDRA-6751
Allow overriding cassandra-rackdc.properties location

Patch by Patrick Ziegler, reviewed by brandonwilliams for CASSANDRA-7072
re-add parameter columns to tracing session

patch by dbrosius reviewed by jbellis for cassandra-6942
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
switch README to asciidoc extension