#2273 Merge revisions from 12.2-dev to 2.12-multilang r22861-r22863,r22891-r22892

git-svn-id: http://svn.ec-cube.net/open/branches/version-2_12-multilang@22897 1e3b908f-19a9-db11-a64c-001125224ba8