[BISERVER-11663] Locale files not working when they include specific
language information
[BISERVER-11496] Removing the deprecation tag until a real replacement solution is available.
Merge pull request #1599 from e-cuellar/master

[BISERVER-11663] Locale files not working when they include specific language information