DF# QCADOOCLS-2278, QCADOOCLS-1896 fixes in locales