Merge remote-tracking branch 'origin/heroku-deployment-tmp' into branch-2.3-MVC

# Conflicts:
#	.github/workflows/fortify-analysis.yml
#	.github/workflows/xanitizer-analysis.yml
#	etc/TODO.md
#	pom.xml

Author: thomaswoehlke