fix wrong patch commit
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Use RandomStringGenerator instead of WordGenerator so BitSetTest passes
on windows.

Patch by Ala' Alkhaldi, reviewed by Joshua McKenzie for CASSANDRA-7060
don't rely on toString being a stable implementation, where possible
Fix memtable copy bug causing rangetombstones to be missed

patch by tjake; reviewed by benedict got CASSANDRA-7371
Merge branch 'cassandra-2.1' into trunk