Merge "Fix for race condition when clearing compaction list" into tm-dev