Merge pull request #2852 from op-jenkins/op-build-update_197_5-6-2019

op-build update 5-6-2019