Merge pull request #3301 from op-jenkins/op-build-update_2343_11-17-2019

op-build update 11-17-2019