Get rid of redundant this references in equals()
Merge branch 'cassandra-2.0' into trunk