[SR-Dev] git:master: - port from kamailio trunk, r5607