FRBEV-28: Code refactoring. Fixes for User/Role entity.

http://jira.freshbyteinc.com/browse/FRBEV-28