Merge pull request #3351 from op-jenkins/op-build-update_181_12-18-2019

op-build update 12-18-2019