fix merge conflict
Merge branch 'cassandra-2.0' into trunk