[TASK] Fix some CGL issues spotted during backporting (part2)

This patch fixes some CGL problems spotted while
syncing Flow Fluid and TYPO3 CMS Fluid
Also removed unneeded backporter tokens from code.
This will ease next backporting a lot.

Change-Id: I6f31adc1bd493f2c818b532b2394a774c17f24b7
Resolves: #44710
Releases: master