Merge "res_pjsip_outbound_registration.c: Be tolerant of short registration timeouts."