Merge 12-1-auto-deploy-20190721 security branch into master

This brings the 12-1-auto-deploy-20190721 branch, which contained security fixes on dev, back into master to bring things back in sync.

EE: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14918