Fix HSHA server introducing corrupt data

patch by xedin; reviewed by slebresne for CASSANDRA-6285
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Fix CAS conditions for COMPACT STORAGE tables

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6813
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/ColumnCondition.java
	src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
Merge branch 'cassandra-2.1' into trunk
Update version, news and license for 2.0.6
Add broadcast_rpc_address option to cassandra.yaml

Patch by Tyler Hobbs, reviewed by Jason Brown for CASSANDRA-5899
Merge branch 'cassandra-2.1' into trunk
avoid reinitiating gossip when nothings changed
Merge branch 'cassandra-2.1' into trunk
simply: no need for iterator to get first item in List
fix typo in cfmbean comparator
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Merge branch 'cassandra-1.2' into cassandra-2.0
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java