Backport #5551 to 1.1
Merge branch 'cassandra-1.1' into cassandra-1.2
Fix changelog
Merge branch 'cassandra-1.2' into trunk