[code sync] Merge code from sonic-net/sonic-swss:202511 to 202511_azd#260

mssonicbld merged 2 commits into

Azure:202511_azdAzure/sonic-swss.msft:202511_azdfrom

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