Merge pull request #1232 from op-jenkins/op-build-update_858_7-10-2017

op-build update 7-10-2017