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
Merge branch 'cassandra-2.1' into trunk