Multisite: Do not fallback to only the directory for sub-directory multisite subsites
Make sure multisite config type is set correctly
Multisite: Re-Add fallback to subdomain and domain without directory
Multisite: Fix setting of config type for sites without subdirectory
Multisite: Make sure we don't cut the subsite's subdirectory off