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

* commit '8279b9d4a9529448b526321ff76eff6a1c2f13f4':
  Remove deprecated locales - DO NOT MERGE