This merge request accomplishes the following
- Removes redundant code
- Always add users as members to both admin and viewer entitlements groups. Though users can be added with owner role in a group, a group cannot be added in another group with owner role. This is a entitlements group addition limitation.