[code sync] Merge code from sonic-net/sonic-swss:202605 to 202606#246

mssonicbld merged 2 commits into

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

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