Fix nodetool display with vnodes.

Patch by brandonwilliams, reviewed by Vijay for CASSANDRA-7082
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.0' into cassandra-2.1