Merge pull request #3096 from op-jenkins/op-build-update_017_8-22-2019

op-build update 8-22-2019