Merge branch 'bugfix/issues-after-upgrade' into 'develop'

Bugfix/issues after upgrade

See merge request t3o/typo3.org!328
5 jobs for develop in 4 minutes and 45 seconds (queued for 1 second)