USHIFT-4277: Small fixes including update for beta mirror changes#4220

openshift-merge-bot[bot] merged 1 commit intoopenshift:mainopenshift/microshift:mainfrom

sjug:beta_mirrorsjug/microshift:beta_mirrorCopy head branch name to clipboard