Merged manually. However, as I did the merge, I noticed:
- the docs were not updated to reflect the new parameter for ipsec_destroy() - you have to update the xml files inside `doc/` subfolder when adding/changing module parameters or functions. This time I did it, you can review to see if you want to add more there - the change of msg structure ruri is not safe by just changing the string pointer and the length, you have to use C function `rewrite_uri(...)` from the core because old value might need to be freed and r-uri-parsed structure invalidated. But such change then it is permanet, if you need it to stay like that, then use `$ru = ...;` in config, functions like `ipsec_destroy()` must not change it permanently (at least not without documenting such behaviour). Therefore I pushed another commit to the module which is no longer replacing msg structure r-uri field, but uses the config parameter to build the contact info.
I also changed the fixup code to use an existing helper function from core, which simplifies that part.
You have to test with latest git master branch and see if it works as expected, if not, then open an issue.