closes #5239
Merge branch '2.5.x' of http://git.centreon.com/centreon into 2.5.x