Merge pull request #2766 from op-jenkins/op-build-update_10_4-8-2019

op-build update 4-8-2019