Restores lost changes when mirror force pushed onto dev

cookbooks/gitlab-omnibus-builder!1 was overridden by the mirror and lost. The chef-repo currently expects this commit to be accessible.

assigned to @ayufan

Conflicts! I'll leave them to @ayufan to resolve. We just need this commit to be available so that chef-repo has a valid reference.

mentioned in issue gitlab-com/infrastructure#1128 (closed)

added 15 commits

• b3ba96b9...7fcb2324 - 14 commits from branch master
• 3a759032 - Merge branch 'master' into 'fix-orphaned-commit'

Compare with previous version

assigned to @marin

mentioned in commit e6413916

merged