LPS-43591 If when assigning site role to user, and user is not a direct member, then add user to site
LPS-43591 Revert LPS-43527 -- This condition should no longer be possible
LPS-43591 Remove non-inherited site roles, already displayed under Sites section
LPS-43591 Source formatting
LPS-43591 Use the user and not themeDisplay to obtain the companyId