Catch an error where salt-run might fail with a KeyError on master_uri. Thanks, Tom!
Merge pull request #7849 from cachedout/develop

Catch a condition where salt-run might fail with a KeyError on master_uri. ...