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

Addresses https://github.com/saltstack/salt/issues/13227
No worries, you're just about there.