Merge branch 'master' of git://git.postgresql.org/git/postgresql into psql_fix_uri_service
Merge branch 'psql_fix_uri_service' of github.com:davidfetter/postgresql_projects into psql_fix_uri_service
Merge branch 'psql_fix_uri_service' of github.com:davidfetter/postgresql_projects into psql_fix_uri_service
Only keep password where it makes sense to