cleanup
merge from 2.1
Merge branch 'cassandra-2.1' into trunk