cqlsh DESC CLUSTER fails retrieving ring information

patch by Adam Holmberg; reviewed by mstepura for CASSANDRA-7687
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk