apply r21381

git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@21438 35612d4c-9d10-0410-837c-bf9dd1be60d7
revert r21437

git-svn-id: https://forge.indepnet.net/svn/glpi/trunk@21440 35612d4c-9d10-0410-837c-bf9dd1be60d7