Merge branch 'ensure-that-build-token-is-always-running-11-5' into 'security-11-5'
[11.5] Ensure that build token is only used when running See merge request gitlab/gitlabhq!2664
[11.5] Ensure that build token is only used when running See merge request gitlab/gitlabhq!2664