Merge "cleanups and fixes for process_madvise compaction" into sc-dev