Fix nodetool display with vnodes.

Patch by brandonwilliams, reviewed by Vijay for CASSANDRA-7082
Merge branch 'cassandra-2.1' into trunk