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