Change removetoken refs to removenode
Merge branch 'cassandra-1.2' into cassandra-2.0