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