Add a client-config-dir and require clients have an entry
Merge branch 'master' of github.com:python/psf-salt