Removed extra translations
Lower datagrid conf popin header hierarchy
Merge branch 'master' into PIM-1965