Merge pull request #4685 from op-jenkins/op-build-update_020_4-22-2022

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