Merge pull request #1362 from op-jenkins/op-build-update_229_8-21-2017

op-build update 8-21-2017