Merge pull request #2908 from op-jenkins/op-build-update_142_5-31-2019

op-build update 5-31-2019