Merge pull request #1779 from op-jenkins/op-build-update_119_1-12-2018

op-build update 1-12-2018