Before resetting the url and username, ensure that we free them in case
they were set by environment variables.

(cherry picked from commit e84914fd)