Cherry-pick #18033 + #18034 (container-publishing fixes) to 3.0-dev#18244

jslobodzian wants to merge 2 commits into

3.0-devmicrosoft/azurelinux:3.0-devfrom

jslobodzian/cherry-pick-18033-18034-to-3.0-devmicrosoft/azurelinux:jslobodzian/cherry-pick-18033-18034-to-3.0-devCopy head branch name to clipboard