[sr-dev] git:master:aa02102c: Merge pull request #229 from kamailio/vseva/usrloc_server_id