Merge pull request #2320 from op-jenkins/op-build-update_043_8-30-2018

op-build update 8-30-2018