[DS-2179] Shibboleth (and probably LDAP) logins fail after merge of Metadata For All

Moving the netid field back to the eperson table.