Merge pull request #3615 from op-jenkins/op-build-update_1117_5-7-2020

op-build update 5-7-2020