Merge pull request #1274 from mdamour1976/master

BISERVER-10602 Issues with groups/roles that have a special character follow by the full word "pentaho" in their name in 5.0
[BISERVER-10966] - Internationalization using locale with country code not working
Merge pull request #1275 from rfellows/dev

[BISERVER-10966] - Internationalization using locale with country code n...