Added support for user context parameter for cleanup_routines
Replaced std::pair with CleanupRoutine struct
Merge branch 'release_context_fix'