sla cid tweaks

Conflicts:
	src/mod/endpoints/mod_sofia/sofia_glue.c
revert
sla cid tweaks