Merge pull request #1258 from op-jenkins/op-build-update_025_7-19-2017

op-build update 7-19-2017