Merge "res_pjsip_header_funcs: Various cleanups"