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
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-inventory-ldap/SPECS/rudder-inventory-ldap.spec
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8
Fixes #4135: propose connection directly to https for the web interface
Merge pull request #183 from VinceMacBuche/rudder_bug4131

Fixes #4135: propose connection directly to https for the web interface
Fixes #4141: RPM postinst command for apache start is missing "Done" output
Merge pull request #184 from jooooooon/bug_4141/rpm_postinst_command_for_apache_start_is_missing_done_output

Fixes #4141: RPM postinst command for apache start is missing "Done" out...
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
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8
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
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8
Fixes #4167: Add a warning before running SQL upgrade script