closes #5710
Merge branch 'master' of http://git.centreon.com/centreon