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

Addresses https://github.com/saltstack/salt/issues/13227
See above, re: return types. There are other spots below too.