Merge pull request #2327 from op-jenkins/op-build-update_037_9-4-2018

op-build update 9-4-2018