refs #5493; refs #5697; refactoring
Merge branch 'master' of http://git.centreon.com/centreon