Raise the phi convict threshold check in 1.2

patch by tjake; reviewed by jbellis for CASSANDRA-7063
Merge branch 'cassandra-1.2' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/streaming/AbstractStreamSession.java
Merge branch 'cassandra-2.1' into trunk
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
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
Fix broken build
Merge branch 'cassandra-2.1' into trunk
Improve error message when trying >= 2.0 on java < 1.7

Patch by brandonwilliams reviewed by thobbs for CASSANDRA-7137
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	conf/cassandra-env.sh
Merge branch 'cassandra-2.1' into trunk
Remove unused isLocalTask method.

Patch by Lyuben Todorov, reviewed by brandonwilliams for CASSANDRA-7181
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Add snapshot "manifest" describing files included
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6326
Merge branch 'cassandra-2.1' into trunk
don't use o.a.commons.io for one method
Merge branch 'cassandra-2.1' into trunk
return all cpu values from BackgroundActivityMonitor.readAndCompute

patch by dbrosius reviewed by jbellis for cassandra-7183