Merge pull request #2518 from op-jenkins/op-build-update_1737_12-11-2018

op-build update 12-11-2018