[code sync] Merge code from sonic-net/sonic-swss:202605 to 202607#263

mssonicbld merged 2 commits into

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

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