Merge pull request #2405 from op-jenkins/op-build-update_043_10-17-2018

op-build update 10-17-2018