Merge branch 'branches/rudder/2.4' into branches/rudder/2.6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge pull request #171 from nperron/ust_3364/dev/3389_add_exclude_file_or_regexp_from_folder_copy_BIS

Fixes #3389 - Add possibility to exclude a file or files matching a regexp from a folder copy
Fixes #3950,#3951: Added an new version of motdConfiguration enabling the user to select where should the MOTD be added
Merge pull request #191 from Kegeruneku/ust_3950/dev/3951_add_append_end_start_option_to_motdconfiguration

Fixes #3950,#3951: Added an new version of motdConfiguration enabling th...
Fixes #3581: Any copyFileFromSharedFolder Directive applied on a policy server will now be using a local copy instead of a remote one
Merge pull request #137 from Kegeruneku/bug_3581/dev/3581_use_local_copies_on_copyfilefromasharedfolder_if_applied_on_rudder_server

Fixes #3581: Any copyFileFromSharedFolder Directive applied on a policy ...
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	initial-promises/rootServerInitialPromises/cfengine-nova/common/core-lib.cf
	techniques/fileDistribution/copyGitFile/1.1/copyFileFromSharedFolder.st
	techniques/fileDistribution/copyGitFile/1.2/copyFileFromSharedFolder.st
	techniques/fileDistribution/copyGitFile/1.3/copyFileFromSharedFolder.st
	techniques/system/common/1.0/rudder_lib.st
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3913 : prevent rsyslog to drop patches
Merge pull request #182 from ncharles/bug_3913/dev/rsyslog_drops_message

Fixes #3913 : prevent rsyslog to drop patches
Fixes #3968: Correct a missing vars: entry in promises.st
Merge pull request #193 from Kegeruneku/bug_3968/dev/3968_fix_promises_st

Fixes #3968: Correct a missing vars: entry in promises.st
Merge branch 'branches/rudder/2.4' into branches/rudder/2.6

Conflicts:
	techniques/system/common/1.0/promises.st
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Fixes #3931 - Change rudder-agent cron file to use /opt/rudder/bin/check-rudder-agent
Refs #3930 - Remove temporary cron file /opt/cron.d/rudder-agent-uuid