Merge pull request #3242 from op-jenkins/op-build-update_020_10-25-2019

op-build update 10-25-2019