[sr-dev] git:master: modules_k/presence: Fixes to cleanup functions