add snapshot repair to NodeToolHelp.yaml
Merge branch 'cassandra-1.2' into cassandra-2.0
Send correct metadata on SELECT COUNT

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6080
Track clients' remote addresses in ClientState

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6070