Merge pull request #2399 from op-jenkins/op-build-update_043_10-12-2018

op-build update 10-12-2018