Merge pull request #2387 from op-jenkins/op-build-update_043_10-8-2018

op-build update 10-8-2018