[AUTO-CHERRYPICK] Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) - branch 3.0-dev#10437

CBL-Mariner-Bot wants to merge 2 commits into3.0-devmicrosoft/azurelinux:3.0-devfrom

cblmargh/cherry-pick-pr-10425-to-3.0-devmicrosoft/azurelinux:cblmargh/cherry-pick-pr-10425-to-3.0-devCopy head branch name to clipboard