BS-11782: use another key for system locale
Merge branch '6.4.x' of https://github.com/bonitasoft/bonita-studio.git into 6.4.x