Combine the two types of authentication providers into one type.
Fix migration to first delete the entity types that may have been created by the framework before migration was run.
Add migration for removing block to edit external authentication providers (was combined with normal authentication providers)