[SR-Dev] git:andrei/fixups: fixups: added kamailio compatible fixups