Merge pull request #1374 from op-jenkins/op-build-update_043_8-24-2017

op-build update 8-24-2017