fix changes merge mess
Merge branch 'cassandra-2.1' into trunk