Merge dev master to CE .com master as part of the security release process
What does this MR do?
Part of the security release process, issue: https://gitlab.com/gitlab-org/release/tasks/issues/339#note_88478295
Part of the security release process, issue: https://gitlab.com/gitlab-org/release/tasks/issues/339#note_88478295