Merge pull request #1763 from op-jenkins/op-build-update_229_1-5-2018

op-build update 1-5-2018