Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy.
Backport feature allowing proxy config to live in pillar OR /etc/salt/proxy.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt