Merge branch 'task/update-to-typo3-v9' into 'develop'

Last fixes for running in TYPO3 v9

See merge request t3o/my!158
5 jobs for develop in 4 minutes and 4 seconds (queued for 1 second)