Allow the system locale not to be reset. Fixes #7190.
Merge pull request #7222 from s0undt3ch/features/7190-no-reset-system-locale

Allow the system locale not to be reset. Fixes #7190.