Merge pull request #1372 from op-jenkins/op-build-update_1329_8-23-2017

op-build update 8-23-2017