Merge pull request #2532 from op-jenkins/op-build-update_043_12-20-2018

op-build update 12-20-2018