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