Merge pull request #3324 from op-jenkins/op-build-update_143_12-5-2019

op-build update 12-5-2019