Christian Kuhn authored Jun 15, 2018 and Jan Helke committed Jun 15, 2018

First batch taking care of "easy" places.

Resolves: #85283
Releases: master
Change-Id: I68fa5a0559aae6191858aba7690ba72918bdf507
Reviewed-on: https://review.typo3.org/57240

Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>