Merge pull request #3016 from op-jenkins/op-build-update_043_7-22-2019

op-build update 7-22-2019