Merge pull request #2893 from op-jenkins/op-build-update_158_5-22-2019

op-build update 5-22-2019