Merge branch 'revert-cc94ebcf' into 'master'

Revert "Merge branch '114-update-follett-metadata-to-use-emailaddress-nameid' into 'master'"

See merge request !141

nefed.xml

@@ -14831,7 +14831,7 @@ KNGked4df0r1o5CozJ35FjKx1fiYucuvGXU+UZd5Yg6sF6MRhQqud32X3eOFJXS/ndm/jGit7B6A
                     </ds:X509Data>
                 </ds:KeyInfo>
             </KeyDescriptor>
-            <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+            <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
             <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://follett.oktapreview.com/sso/saml2/0oa1ye8nbxDnAh8Ok1d7" index="0" isDefault="true" />
             <AttributeConsumingService index="0">
                 <ServiceName xml:lang="en">efollett QA 507 Nebraska IdP</ServiceName>