Fix flake8 errors
Add canonical locale mapping for Bug 1101261