Merge pull request #4791 from op-jenkins/op-build-update_1021_6-16-2022

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