Merge pull request #2389 from op-jenkins/op-build-update_043_10-9-2018

op-build update 10-9-2018