Merge pull request #2824 from op-jenkins/op-build-update_1329_4-26-2019

op-build update 4-26-2019