Merge pull request #1956 from op-jenkins/op-build-update_1025_3-9-2018

op-build update 3-9-2018