Reworked mapping of Katello organizations, environments and content views.