release-22.2:Backport!6775

Merged Andrey Vertiprahov requested to merge cherry-pick-e22e0e80 into release-22.2

Fix changelog reorder when compact.

See merge request !6775 (merged)

(cherry picked from commit e22e0e80)

b8fcbcd5 Fix changelog reorder when compact. 9738e064 Fix flake.

Merge request reports