Update peer information when a node jumps to normal.

Patch by brandonwilliams, reviewed by Richard Low for CASSANDRA-7122
Merge branch 'cassandra-1.2' into cassandra-2.0
merge
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk