Merge branch 'update-autodevops-template' of gitlab.com:gitlab-org/gitlab-ce into update-autodevops-template