added support for Satellite organizations with entitlement settings