fix equals to compare this to the parm, rather than this to this
Merge branch 'cassandra-2.1' into trunk