Refactored out tenant resolve logic to a crmTenantResolver bean