ninja-kill DatabaseDescriptor.validateMemtableX() leftovers
Merge branch 'cassandra-1.1' into cassandra-1.2