Add multiple memory allocation options for memtables
patch by benedict and xedin; reviewed by marcuse and xedin for CASSANDRA-6689
fix problem with localCopy methods after CASSANDRA-6689
Merge branch 'cassandra-2.1' into trunk