Merge remote-tracking branch 'origin/cassandra-2.0' into cassandra-2.0
Update CHANGES for CASSANDRA-6522
Merge branch 'cassandra-2.0' into trunk
Update CHANGES after CASSANDRA-5357
nope 6522 was not merged from 1.2
Merge branch 'cassandra-2.0' into trunk