Merge pull request #4682 from op-jenkins/op-build-update_020_4-21-2022

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