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
avoid reinitiating gossip when nothings changed
fix typo in cfmbean comparator
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/tools/NodeCmd.java
nodetool no longer shows node joining
patch by driftx; reviewed by Vijay for CASSANDRA-6811
Move misplaced try catch block

ActiveRepairService#getNeighbors can throw IllegalArgumentException,
not forceKeyspaceRepair.
Fix CQL doc
Merge branch 'cassandra-1.2' into cassandra-2.0
Fix saving triggers to schema

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6789
Fix trigger mutations when base mutation list is immutable

patch by Sam Tunnicliffe; reviewed by Aleksey Yeschenko for
CASSANDRA-6790
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/service/StorageProxy.java
Fix TriggersTest
Allow cassandra-stress to set compaction strategy options
patch by Benedict Elliott Smith; reviewed by Russell Spitzer for CASSANDRA-6451
nodetool no longer shows node joining (Also fix nodetool status)
patch by Vijay; reviewed by driftx for CASSANDRA-6811
Merge branch 'cassandra-1.2' into cassandra-2.0

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