Merge pull request #3574 from op-jenkins/op-build-update_143_4-20-2020

op-build update 4-20-2020