Fix nodetool netstats

Patch by marcuse; reviewed by JoshuaMcKenzie for CASSANDRA-7270
Merge branch 'cassandra-2.1' into trunk