Adjust nodetool for changes from CASSANDRA-5549.
patch by Mikhail Stepura; reviewed by Yuki Morishita for CASSANDRA-6739
Merge branch 'cassandra-2.1' into trunk