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

Merged

mssonicbld merged 2 commits intoAzure:202205from mssonicbld:sonicbld/202205-merge

Sep 27, 2023

+4-4

Commits on Sep 27, 2023

[nokia]: Updated total headroom pool size to accommodate 100G ports on T2 uplinks (#16690)

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