Fix rebase merge conflicts

* had to rebase and accept both in some cases
* remove unused imports

Author: thedoubl3j

awx/api/views/__init__.py

@@ -62,9 +62,6 @@
 # django-ansible-base
 from ansible_base.lib.utils.requests import get_remote_hosts
 from ansible_base.rbac.models import RoleEvaluation
-from ansible_base.resource_registry.shared_types import OrganizationType, TeamType, UserType
-from ansible_base.rbac.models import RoleEvaluation, ObjectRole
-from ansible_base.rbac import permission_registry
 
 # AWX
 from awx.main.tasks.system import send_notifications, update_inventory_computed_fields