Ref #4132: slapd always restarted
Merge pull request #182 from VinceMacBuche/bug/4132/always_restart_slapd

Ref #4132: slapd always restarted
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec
	rudder-inventory-ldap/debian/postinst
Fixes #4147: Enforce creation of UUID at first install
Merge pull request #185 from VinceMacBuche/bug_4147/UUID_at_firstinstall

Fixes #4147: Enforce creation of UUID at first install
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Fixes #3314: Jetty extra classpath are separated with comma, not column
Merge pull request #186 from fanf/bug_3314/bad_jetty_extra_classpath_syntax

Fixes #3314: Jetty extra classpath are separated with comma, not column
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Fixes #4290: Fix RedHat EL6 jre dependency
Merge pull request #202 from Kegeruneku/bug_4290/int/4290_fix_jre_dependency_on_rudder_jetty

Fixes #4290: Fix RedHat EL6 jre dependency
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6