Merge pull request #2321 from op-jenkins/op-build-update_223_8-31-2018

op-build update 8-31-2018