Merge pull request #3587 from op-jenkins/op-build-update_014_4-27-2020

op-build update 4-27-2020