Port s390x/other arches fixes from master to rhcos-4.2 with some tweaks #772
Prashanth684:rhcos-4.2-multiarch% was force-pushed and no longer has any new commits.
Pushing new commits will allow the pull request to be re-opened.
Pushing new commits will allow the pull request to be re-opened.