Merge remote-tracking branch 'origin/master' into edge

Author: jonasbardino

tests/fixture/confs-stdlocal/MiG.conf

@@ -1779,8 +1779,9 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
         <IfDefine !SID_FQDN>
             <IfDefine BASE_FQDN>
                 # NOTE: the contents of this static file can be generated with:
-                # cd /home/mig/mig && python shared/httpsclient.py | \
-                #   grep -A 80 "xml version" > /home/mig/state/wwwpublic/oiddiscover.xml
+                # cd /home/mig && python mig/server/genoiddiscovery.py > \
+                #     /home/mig/state/wwwpublic/oiddiscover.xml
+                # when openid is enabled in MiGserver.conf
                 Header always set X-XRDS-Location "https://${BASE_FQDN}/public/oiddiscover.xml"
             </IfDefine>
         </IfDefine>
@@ -2380,8 +2381,9 @@ Alias /.well-known/security.txt "/home/mig/state/wwwpublic/.well-known/security.
         <IfDefine !SID_FQDN>
             <IfDefine BASE_FQDN>
                 # NOTE: the contents of this static file can be generated with:
-                # cd /home/mig/mig && python shared/httpsclient.py | \
-                #   grep -A 80 "xml version" > /home/mig/state/wwwpublic/oiddiscover.xml
+                # cd /home/mig && python mig/server/genoiddiscovery.py > \
+                #     /home/mig/state/wwwpublic/oiddiscover.xml
+                # when openid is enabled in MiGserver.conf
                 Header always set X-XRDS-Location "https://${BASE_FQDN}/public/oiddiscover.xml"
             </IfDefine>
         </IfDefine>