GTNPORTAL-3315: Remove clone of OrganizationDatabaseInitializer and improve PortalSetupService