optionally get etcd vals from master, squash stack traces, and fix lint ...

Addresses https://github.com/saltstack/salt/issues/13227
We really need to be consistent in the data type that's returned. If it doesn't make sense to return an empty dict, then we should raise an exception.