refs #5538
refs #5547
refs #5538
Merge branch 'master' of http://git.centreon.com/centreon