Clean up Memtable.resolve()
Merge branch 'cassandra-1.2' into cassandra-2.0