Merge branch 'ensure-that-build-token-is-always-running' into 'security-11-6'
[11.6] Ensure that build token is always running See merge request gitlab/gitlabhq!2563
[11.6] Ensure that build token is always running See merge request gitlab/gitlabhq!2563