Merge pull request #2964 from op-jenkins/op-build-update_043_6-28-2019

op-build update 6-28-2019