Merge pull request #2309 from op-jenkins/op-build-update_043_8-28-2018

op-build update 8-28-2018