Merged postgresql into cleanups.
Don't use unit number when generating usernames (patch from Oskar Stephens)
Tidy
[stub] don't use the unit number when generating usernames