Merge branch 'develop' of https://github.com/saltstack/salt into develop
do remove PGPASSFILE only when password is set
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge pull request #4388 from giantlock/develop

fix pgpassfile removing