Merge pull request #3580 from op-jenkins/op-build-update_229_4-22-2020

op-build update 4-22-2020