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

Addresses https://github.com/saltstack/salt/issues/13227
@techhat I reverted to something resembling your original code with the dictionary updates you recommended. Please have a look at the latest revision.

Thanks!