Looks fine to me, you can merge.
Just a note for the archive - would probably make sense to review static int handle_ruri_alias(struct sip_msg *msg) in nathelper.c, which does a kind of similar function internally like the new added extract_alias_ip_port, to see if this could be generalized and maybe added to the core.