Merge pull request #1386 from op-jenkins/op-build-update_043_8-30-2017

op-build update 8-30-2017