Merge pull request #2410 from op-jenkins/op-build-update_043_10-22-2018

op-build update 10-22-2018