Also add a single environment to use for uploading nightlies,
thus restricting the environment variables passed to the upload script
and making it easier to add other uploading environments.

Also fix the make_step functions to actually use the configured
environment instead of just using self.environment.