Fix nodetool ring and status output format for ipv6 addresses
Patch by Michal Michalsky, reviewed by brandonwilliams for
CASSANDRA-5302
Merge branch 'cassandra-1.2' into trunk