Merge "res_pjsip: Fix issues that prevented shutdown of modules."