Merge pull request #2882 from op-jenkins/op-build-update_222_5-15-2019

op-build update 5-15-2019