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

Addresses https://github.com/saltstack/salt/issues/13227
I'll admit I was a little fuzzy with what the expectations were there. I'll poke around the code some more for examples.