Merge pull request #2763 from op-jenkins/op-build-update_1554_4-5-2019

op-build update 4-5-2019