status output is confused when hostname resolution is enabled
patch by Vijay; reviewed by Brandon Williams for CASSANDRA-6896
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
Merge branch 'cassandra-2.1' into trunk