WS-3239 Random ingest_envoy fixes

Daniel Nemergutrequested to merge
ws3239-evla_sdm_ingest_fixes into development

This fixes a couple issues I ran into with local testing.

Merge request reports