Merge "pjsip_resolver.c: Use replacement function"