Fix paths in proxyminion example

Default pillar root is /srv/pillar, not /srv/salt/pillar.
Remove references to deprecated config options
Merge pull request #14361 from pass-by-value/remove_config_references2

Remove references to deprecated config options
Merge branch '2014.7' into develop
Merge pull request #14362 from s0undt3ch/develop

Forward Merge #14361