Merge pull request #2922 from op-jenkins/op-build-update_043_6-6-2019

op-build update 6-6-2019