Merge pull request #1 from mandriva-management-console/master

update from upstream
Fixes #2348 :GLPI: Check if webservices plugin is enabled when delete a machine
Fixes #2437 : appstream: as soon as credentials are entered by the user, do not show username and password fields
Fixes #2438 : move discovery page to computer
Fixes #2441 Monitoring: be able to personnalize graphic period
Fixes #2440 : Monitoring: be able to set frequency check
Fixes #2439 : On discovery page, hide uptime column
Merge branch 'master' of https://github.com/inkhey/mmc into inkhey-master
Merge branch 'inkhey-master'