[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205#106

Merged

mssonicbld merged 2 commits intoAzure:202205from

mssonicbld:sonicbld/202205-merge

Sep 10, 2023

Commits on Sep 9, 2023

[frr]: lib: Fix corruption when routemap delete/add sequence happens (#16456)
rajendrat
authored

Commits on Sep 10, 2023

Merge branch '202205' of https://github.com/sonic-net/sonic-buildimage into 202205
mssonicbld
committed