Merge pull request #2401 from op-jenkins/op-build-update_043_10-15-2018

op-build update 10-15-2018