fix changes/news
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
 Set keepalive on MessagingService connections
patch by Jianwei Zhang; reviewed by jbellis for CASSANDRA-7170
Merge branch 'cassandra-1.2' into cassandra-2.0
remove duplicate queries for local tokens

patch by dbrosius reviewed by ayeschenko for cassandra-7182
Merge branch 'cassandra-1.2' into cassandra-2.0
Warn when timestamps are provided on CAS batch

patch by slebresne; reviewed by iamaleksey for CASSANDRA-7067
Remove duplicate entries in changelog
Validate statements inside batch
Raise the phi convict threshold check in 1.2

patch by tjake; reviewed by jbellis for CASSANDRA-7063
Starting threads in the OutboundTcpConnectionPool constructor causes race conditions

patch by sbtourist; reviewed by jasobrown for CASSANDRA-7177
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
Improve error message when trying >= 2.0 on java < 1.7

Patch by brandonwilliams reviewed by thobbs for CASSANDRA-7137
Remove unused isLocalTask method.

Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-7181
return all cpu values from BackgroundActivityMonitor.readAndCompute

patch by dbrosius reviewed by jbellis for cassandra-7183
reduce garbage creation in calculatePendingRanges

patch by dbrosius reviewed by bwilliams for cassandra-7191
Merge branch 'cassandra-1.2' into cassandra-2.0
fix c* launch issues on Russian os's due to output of linux 'free' cmd

patch by dbrosius reviewed by bwilliams for cassandra-6162