Merge pull request #346 from dsanders11/patch-1

Always update the call ID when updating a contact in usrloc table
(cherry picked from commit e13ab398d8b14bffa2acb6145b253aec030fdaab)

Conflicts:
	modules/usrloc/ucontact.c