[code sync] Merge code from sonic-net/sonic-swss:202511 to 202601#256

mssonicbld merged 2 commits into

Azure:202601Azure/sonic-swss.msft:202601from

mssonicbld:sonicbld/202601-mergemssonicbld/sonic-swss.msft:sonicbld/202601-mergeCopy head branch name to clipboard