Merge pull request #3714 from op-jenkins/op-build-update_181_6-18-2020

op-build update 6-18-2020