forgot to add CASSANDRA-7317 to CHANGES
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk