upgrade to CLHM 1.4
patch by jbellis for CASSANDRA-5821
Alter the wording of assassination end logging
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/gms/Gossiper.java
Merge branch 'cassandra-2.0' into trunk