Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Storage Proxy should register instance not new instance
patch by Ed Capriolo; reviewed by jbellis for CASSANDRA-6856
Merge branch 'cassandra-2.1' into trunk