Merge pull request #3513 from op-jenkins/op-build-update_12_3-18-2020

op-build update 3-18-2020