887095 - cli locale was not set properly
887095 - Fixing test and feedback
Merge pull request #1461 from daviddavis/i18n-fallback

Fixing tests from #1446 so we can release the 1.1.2 puddle