Merge pull request #3566 from op-jenkins/op-build-update_143_4-16-2020

op-build update 4-16-2020