Merge pull request #4693 from op-jenkins/op-build-update_96_4-26-2022

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