Merge branch '135-update-critical-labs-entity-id' into 'master'

Another attempt :(

Closes #135

See merge request !183

nefed.xml

@@ -15568,14 +15568,14 @@ KNGked4df0r1o5CozJ35FjKx1fiYucuvGXU+UZd5Yg6sF6MRhQqud32X3eOFJXS/ndm/jGit7B6A
         </Extensions>
         <SPSSODescriptor WantAssertionsSigned="true" AuthnRequestsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
             <KeyDescriptor use="encryption">
-                <ds:KeyInfo xmlns:ds="http://www.w3.org/2001/04/xmldsig-more#">
+                <ds:KeyInfo>
                     <ds:x509Data>
                         <ds:X509Certificate>MIIFmjCCA4ICCQCmreaBWTHM5zANBgkqhkiG9w0BAQsFADCBjjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5lYnJhc2thMQ4wDAYDVQQHDAVPbWFoYTEWMBQGA1UECgwNQ3JpdGljYWwgTGFiczEbMBkGA1UEAwwSKi5jcml0aWNhbGxhYnMuY29tMScwJQYJKoZIhvcNAQkBFhhzdXBwb3J0QGNyaXRpY2FsbGFicy5jb20wHhcNMjIwMzExMTcwNTUyWhcNMzIwMzA4MTcwNTUyWjCBjjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5lYnJhc2thMQ4wDAYDVQQHDAVPbWFoYTEWMBQGA1UECgwNQ3JpdGljYWwgTGFiczEbMBkGA1UEAwwSKi5jcml0aWNhbGxhYnMuY29tMScwJQYJKoZIhvcNAQkBFhhzdXBwb3J0QGNyaXRpY2FsbGFicy5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDSjmd2sG5eSLddOoDYJFoChktgmMSa0WEaMC3mkrcpxVJfh0azZwlhp7j49+vy7Ef1Cm1I/uvT99e1zKq7LJhsnbk9PeCZ1SEG8HnX4bpS98Km7mimjvM76d0CSwrzqzzUBbIq/OIACm/DvyWd4QOHMluKktYRqUJEgJRR7D+CcUse1NcWONA4U5aCR6iC3vf1crkfQANrOpPi0iW2N/C4qXhvnTxPDMoZJGa8/6rr8k4zD49ID5JKygcrpIUPYb2kWDaVJypgPKpg+L6Vou+HFRXLyXNwAHCzYdkmFcKeNGaImnPKZQniqtjIOx1TlnyeKqHh/Q/CKHMk7clWczZJQWwQ2iEbadYx+ywqZZXLx+KeQZ26XRDGTCpZilMIjdy3o9Koww6NgoctWbXYNrZQIXJCBlordNCaTCBrPNWpt1q9tJwW3rf8erCCo/MQuApxin/kTyntPScbFGqfXdkf3Djk+pPSRUvL9nhwS1c3XnPeMHtMVx8iZQop5upqpPtSnkJEG4OBAGjvyUSoanxYvvGYzUhpjPbOcDSV2yNAurvb2TwEdBXV9krd+WA72+vDm0yh8mbjRUmsnYC8gGBUxY4RA1DstwRwm05V3SRnCpBlrtB98G/4guOdngDzT46pqWOMAdyERIEafovG50hmUiUG0th9uThJA0jwDsZxIwIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQAKcT4CI/bHEqpOe4vhmENSXkJu/5+5LF6uVWn+x78XgI0D/vmcjp6o52GYmHRhjJhopmZrRM0ytkIUMUVErOUykWGSgJw5whGIbCOeCba7KG9FvS4kO/2+wjRYkBGZgTR7ki2W02E1SGwVtlDUzPCNzRo/r6Ja9IyGG9m2VBKgfBzLPFh+scbSsrjfzqVN3/E3vEpzst34YrbD5HPqsijDOzhc+I/RUXheMSBvezvBkrbABmalQi9VUL3uPH0405nm1ZfjeN/GsBnU8gYL1YPIUU4QuAxu3pe4jR64HkD45bEu/6uNt0El/IAUG69cQwYrvsPXIF5mnb1styRHhmb/os18bBe13j3pNNSlg1jcDp2n5VgeImXIo4LMgtmbiZODNdwqhE5SpwW7W3agXvTvDykmCe6Vu5jUS/ezbErfJLrDfjt6J5szoBTzkRGa29Y9EVZseoxxqoOTpxBus7YL2AAq8/dxAvjTy3UcCAbxtLc6hb2amrpcCWh59Oh4cbwbZ4TbfezgI3EYYEOU2Db/16tC1GrGfhqGoxExSpOZ75wfD/PP6ln6diA5vg1tuL6aWCN7hHMELX3Has2oPtnfKakvGWKShkWlkj7VsuR4vBLbfxbBCKCVg2ktnAO2Psw0dR7SCGYjp6PIfwucvQ1TEphxkvTbYXmN5r7r7DaHPw==</ds:X509Certificate>
                     </ds:x509Data>
                 </ds:KeyInfo>
             </KeyDescriptor>
             <KeyDescriptor use="signing">
-                <ds:KeyInfo xmlns:ds="http://www.w3.org/2001/04/xmldsig-more#">
+                <ds:KeyInfo>
                     <ds:x509Data>
                         <ds:X509Certificate>MIIFmjCCA4ICCQCmreaBWTHM5zANBgkqhkiG9w0BAQsFADCBjjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5lYnJhc2thMQ4wDAYDVQQHDAVPbWFoYTEWMBQGA1UECgwNQ3JpdGljYWwgTGFiczEbMBkGA1UEAwwSKi5jcml0aWNhbGxhYnMuY29tMScwJQYJKoZIhvcNAQkBFhhzdXBwb3J0QGNyaXRpY2FsbGFicy5jb20wHhcNMjIwMzExMTcwNTUyWhcNMzIwMzA4MTcwNTUyWjCBjjELMAkGA1UEBhMCVVMxETAPBgNVBAgMCE5lYnJhc2thMQ4wDAYDVQQHDAVPbWFoYTEWMBQGA1UECgwNQ3JpdGljYWwgTGFiczEbMBkGA1UEAwwSKi5jcml0aWNhbGxhYnMuY29tMScwJQYJKoZIhvcNAQkBFhhzdXBwb3J0QGNyaXRpY2FsbGFicy5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDSjmd2sG5eSLddOoDYJFoChktgmMSa0WEaMC3mkrcpxVJfh0azZwlhp7j49+vy7Ef1Cm1I/uvT99e1zKq7LJhsnbk9PeCZ1SEG8HnX4bpS98Km7mimjvM76d0CSwrzqzzUBbIq/OIACm/DvyWd4QOHMluKktYRqUJEgJRR7D+CcUse1NcWONA4U5aCR6iC3vf1crkfQANrOpPi0iW2N/C4qXhvnTxPDMoZJGa8/6rr8k4zD49ID5JKygcrpIUPYb2kWDaVJypgPKpg+L6Vou+HFRXLyXNwAHCzYdkmFcKeNGaImnPKZQniqtjIOx1TlnyeKqHh/Q/CKHMk7clWczZJQWwQ2iEbadYx+ywqZZXLx+KeQZ26XRDGTCpZilMIjdy3o9Koww6NgoctWbXYNrZQIXJCBlordNCaTCBrPNWpt1q9tJwW3rf8erCCo/MQuApxin/kTyntPScbFGqfXdkf3Djk+pPSRUvL9nhwS1c3XnPeMHtMVx8iZQop5upqpPtSnkJEG4OBAGjvyUSoanxYvvGYzUhpjPbOcDSV2yNAurvb2TwEdBXV9krd+WA72+vDm0yh8mbjRUmsnYC8gGBUxY4RA1DstwRwm05V3SRnCpBlrtB98G/4guOdngDzT46pqWOMAdyERIEafovG50hmUiUG0th9uThJA0jwDsZxIwIDAQABMA0GCSqGSIb3DQEBCwUAA4ICAQAKcT4CI/bHEqpOe4vhmENSXkJu/5+5LF6uVWn+x78XgI0D/vmcjp6o52GYmHRhjJhopmZrRM0ytkIUMUVErOUykWGSgJw5whGIbCOeCba7KG9FvS4kO/2+wjRYkBGZgTR7ki2W02E1SGwVtlDUzPCNzRo/r6Ja9IyGG9m2VBKgfBzLPFh+scbSsrjfzqVN3/E3vEpzst34YrbD5HPqsijDOzhc+I/RUXheMSBvezvBkrbABmalQi9VUL3uPH0405nm1ZfjeN/GsBnU8gYL1YPIUU4QuAxu3pe4jR64HkD45bEu/6uNt0El/IAUG69cQwYrvsPXIF5mnb1styRHhmb/os18bBe13j3pNNSlg1jcDp2n5VgeImXIo4LMgtmbiZODNdwqhE5SpwW7W3agXvTvDykmCe6Vu5jUS/ezbErfJLrDfjt6J5szoBTzkRGa29Y9EVZseoxxqoOTpxBus7YL2AAq8/dxAvjTy3UcCAbxtLc6hb2amrpcCWh59Oh4cbwbZ4TbfezgI3EYYEOU2Db/16tC1GrGfhqGoxExSpOZ75wfD/PP6ln6diA5vg1tuL6aWCN7hHMELX3Has2oPtnfKakvGWKShkWlkj7VsuR4vBLbfxbBCKCVg2ktnAO2Psw0dR7SCGYjp6PIfwucvQ1TEphxkvTbYXmN5r7r7DaHPw==</ds:X509Certificate>
                     </ds:x509Data>