Merge pull request #2904 from op-jenkins/op-build-update_043_5-30-2019

op-build update 5-30-2019