Merge branch 'cleanup/reorder-changelog' into 'master'

reorder changelog

See merge request !3157

(cherry picked from commit bcb693e3)

5eb589c6 reorder changelog
5 jobs for !3158 with cherry-pick-bcb693e3
latest merge request