Merge pull request #4803 from op-jenkins/op-build-update_1554_6-21-2022

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