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

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