Merge pull request #2333 from op-jenkins/op-build-update_043_9-6-2018

op-build update 9-6-2018