Merge pull request #2336 from op-jenkins/op-build-update_043_9-10-2018

op-build update 9-10-2018