Merge remote-tracking branch 'upstream/main' into merge-upstream

# Conflicts:
#	.gitignore
#	management/auth.py
#	management/daemon.py
#	management/mail_log.py
#	management/mailconfig.py
#	management/mfa.py
#	management/ssl_certificates.py
#	management/status_checks.py
#	management/utils.py
#	management/web_update.py
#	setup/mail-postfix.sh
#	setup/migrate.py
#	setup/preflight.sh
#	setup/webmail.sh
#	tests/test_mail.py
#	tools/editconf.py

.github/workflows/commit-tests.yml

@@ -22,13 +22,14 @@ jobs:
           path: tests/out/**/screenshot.png
           if-no-files-found: ignore
           retention-days: 5
-    
+
   # install upstream miab, then migrate to miabldap
   upgrade-from-upstream:
     runs-on: ubuntu-22.04
     env:
       PRIMARY_HOSTNAME: box2.abc.com
-      UPSTREAM_TAG: main
+      # TODO: change UPSTREAM_TAG to 'main' once upstream is installable
+      UPSTREAM_TAG: v67
     steps:
       - uses: actions/checkout@v2
       - name: setup