Merge branch 'hotfix/3.3.5' into develop

Conflicts:
	composer.json
	composer.lock
	contao/install.php
	contao/password.php
	index.php
	system/docs/CHANGELOG.md