Cherry-pick #18769 to 7.8: Guard against empty stream.datasource and namespace#18806

Merged

michalpristas merged 2 commits intoelastic:7.8from michalpristas:backport_18769_7.8

May 28, 2020

+228-6

Commits on May 28, 2020