Made scoped_malloc_t::swap be private again.
Merge branch 'sam_cleanup_operations' into sam_cleanup_operations_cc
Merge branch 'sam_cleanup_operations_cc' into sam_cleanup_expiration