[0.85] #4385: mergesoftware => Software:merge


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@21556 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] Fix move_license (but not switch to new MA system)


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@21557 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] Remove debug from previous


git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@21558 35612d4c-9d10-0410-837c-bf9dd1be60d7