1.2 nodes show 2.0 nodes as up when upgrading.
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-6554
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/gms/Gossiper.java
Fix logback config in scripts and packaging.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530
Ninja fix simple bugs from #6438
refactor nodetool, encapsulating each command into a subclass
patch by Clément Lardeur; reviewed by Mikhail Stepura for CASSANDRA-6381
Don't update system table for unknown nodes/dead states
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6053
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't update system table for unknown nodes/dead states
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6053
Merge branch 'cassandra-2.0' into trunk
make isDeadState public
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix tests
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
fix tests
Revert "fix tests"

This reverts commit fbd51b77a047f2a04a94c4b474881c2be9bf1171.
Merge branch 'cassandra-2.0' into trunk
update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407
Merge branch 'cassandra-2.0' into trunk