Applied changes from PR#17263 to master to align with branching strategy #19877

yxieca merged 2 commits intosonic-net:mastersonic-net/sonic-mgmt:masterfrom

nnelluri-cisco:cherry-pick-17263nnelluri-cisco/sonic-mgmt:cherry-pick-17263Copy head branch name to clipboard