Merge pull request #1348 from op-jenkins/op-build-update_043_8-17-2017

op-build update 8-17-2017