Merge "res_pjsip_outbound_registration.c: Fix whitespace conflict potential."