am b7cfdd89: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit 'b7cfdd89b197ea9440bef558987202f5411ef762':
  Remove deprecated locales - DO NOT MERGE