clean out in_memory_compaction_limit
patch by jbellis; reviewed by ayeschenko for CASSANDRA-7428
Merge branch 'cassandra-2.1' into trunk