Merge pull request #2335 from op-jenkins/op-build-update_043_9-7-2018

op-build update 9-7-2018