Fix some cgl flaws that slipped through during the bootstrap refactoring.

Change-Id: Id2d122d0afdb3e0e1091a13eeecf62c1c67236f4
Resolves: #37236
Releases: 6.0
Reviewed-on: http://review.typo3.org/11261
Reviewed-by: Christian Kuhn
Tested-by: Christian Kuhn