[SR-Dev] git:master: integrate sip-router compatiblity patches from Jan Janak