Fixes #4018: increase the limitation on the read uuid file to 50 characters
Fixes #4040 - Remove the comma after promiser which check the password of PostgreSQL
Merge pull request #210 from nperron/bug_4040/dev/remove_comma_after_promiser_in_passwordcheck

Fixes #4040 - Remove the comma after promiser which check the password of PostgreSQL
Fixes #4032: Rudder disclaimer has a typo on "server?s" (should be "server's")
Fixes #4021: Reporting message that state that curl is missing shoudl be clearer
Merge pull request #209 from ncharles/bug_4018/dev/limitation_on_uuid_lenght

Fixes #4018: increase the limitation on the read uuid file to 50 characters
Merge pull request #215 from jooooooon/bug_4021/reporting_message_that_state_that_curl_is_missing_shoudl_be_clearer

Fixes #4021: Reporting message that state that curl is missing should be clearer
Fixes #4048 - Remove duplicate lines from wrong merge
Merge pull request #217 from nperron/bug_4048/int/fix_broken_reporting_of_git_lock_check

Fixes #4048 - Remove duplicate lines from wrong merge
Merge pull request #214 from jooooooon/bug_4032/rudder_disclaimer_has_a_typo_on_server_s_should_be_server_s

Fixes #4032: Rudder disclaimer has a typo on "server?s" (should be "server's")
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	initial-promises/node-server/inventory/1.0/fetchFusionTools.cf
	initial-promises/node-server/inventory/1.0/fusionAgent.cf
	techniques/system/distributePolicy/1.0/passwordCheck.st
	techniques/system/inventory/1.0/fetchFusionTools.st
	techniques/system/inventory/1.0/fusionAgent.st
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	techniques/applications/aptPackageManagerSettings/1.0/aptPackageManagerSettings.st
	techniques/applications/openvpnClient/1.0/openvpnClientConfiguration.st
	techniques/applications/zypperPackageManagerSettings/1.0/zypperPackageManagerSettings.st
	techniques/system/common/1.0/rudder_stdlib.st
	techniques/systemSettings/misc/clockConfiguration/1.0/clockConfiguration.st
	techniques/systemSettings/networking/dnsConfiguration/1.0/check_dns_configuration.st
	techniques/systemSettings/networking/dnsConfiguration/1.1/check_dns_configuration.st
	techniques/systemSettings/remoteAccess/sshConfiguration/1.0/sshConfiguration.st
Merge branch 'branches/rudder/2.7'