Merge branch 'cmcfarland/snowplow' of ops.gitlab.net:gitlab-com/gitlab-com-infrastructure into cmcfarland/snowplow Rebasing onto master.
