Fix configuration error when running nodetool ring

Patch by Tyler Hobbs; reviewed by Jeremiah Jordan for CASSANDRA-7508
Merge branch 'cassandra-2.1.0' into cassandra-2.1