White-label CSID
WHISTLE-42: opensips tweaks
Merge branch 'master' into qa