BC-1964 AppManifest & DirectoryTenantRepository fix