Merge pull request #2412 from op-jenkins/op-build-update_043_10-24-2018

op-build update 10-24-2018