[IM] Code review - small tweaks and improvements
Merge branch 'im-contacts-user' of https://github.com/opensolutions/IXP-Manager into im-contacts-user