Merge pull request #2758 from op-jenkins/op-build-update_36_4-4-2019

op-build update 4-4-2019