Merge pull request #1365 from op-jenkins/op-build-update_043_8-22-2017

op-build update 8-22-2017