Merge pull request #2484 from op-jenkins/op-build-update_043_11-23-2018

op-build update 11-23-2018