Merge pull request #1051 from op-jenkins/op-build-update_05_5-1-2017

op-build update 5-1-2017