Merge pull request #4800 from op-jenkins/op-build-update_020_6-21-2022

op-build ibm-release-fw1020 update 6-21-2022