Merge pull request #1381 from op-jenkins/op-build-update_043_8-29-2017

op-build update 8-29-2017