Merge "Fix system locale propagation during user creation." into nyc-dev