Add --resolve-ip option to 'nodetool ring'

patch by Yasuharu Goto; revised by Mikhail Stepura for CASSANDRA-7210
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk