Merge pull request #1260 from op-jenkins/op-build-update_025_7-20-2017

op-build update 7-20-2017