Merge branch 'winh-merge-dev-docs' into 'master'

Resolve merge conflicts with dev.gitlab.org/master after security release

See merge request gitlab-org/gitlab-ce!15851

(cherry picked from commit d9f40fdd)

4f992572 Update CHANGELOG.md for 10.2.4
84b3c215 Update CHANGELOG.md for 10.1.5
fad2a07c Update CHANGELOG.md for 10.0.7
10131bf2 Merge remote-tracking branch 'gitlab-ce/master'
d9453a24 Merge dev.gitlab.org/master into winh-merge-dev
be586388 Make CHANGELOG.md consistent for 10.2.4, 10.1.5, and 10.0.7