bootstrap: fix locale command

also added the locale to the testenv pre-deploy.yml,
machines spun up by test was giving locale errors in
shell.

there's a few items in the two that should
be DRYed up a little.
I was seeing some weird errors when I ran `/usr/sbin/locale-gen en_US.UTF-8` so I seperated them out.  however I'm not seeing those errors now,  I'll dig into that again, it could be the error was only occuring when the locale wasn't pre-generated.