Merge pull request #3716 from op-jenkins/op-build-update_143_6-22-2020

op-build update 6-22-2020