Refs #4328: correct typo introduced by a37c059efe465de1dcb76451068f3fbfdd86495b (missing comma)
Merge pull request #265 from ncharles/bug_4328/dev/correct_typo

Refs #4328: correct typo introduced by a37c059efe465de1dcb76451068f3fbfd...
Fixes #4368: Technique "Download a file from the shared folder": no default value for perms
Fixes #4371: Not all Techniques use "copy_backup => timestamp" and "edit_backup => timestamp"
Merge pull request #271 from jooooooon/bug_4371/not_all_techniques_use_copy_backup_timestamp_and_edit_backup_timestamp

Fixes #4371: Not all Techniques use "copy_backup => timestamp" and "edit...
Fixes #4375: add location of shared-folder in techniques
Merge pull request #270 from jooooooon/bug_4368/technique_download_a_file_from_the_shared_folder_no_default_value_for_perms

Fixes #4368: Technique "Download a file from the shared folder": no defa...
Merge pull request #272 from ncharles/ust_4353/dev/4375_explain_where_are_share_folder

Fixes #4375: add location of shared-folder in techniques
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7
Merge branch 'branches/rudder/2.7' into branches/rudder/2.8

Conflicts:
	techniques/system/distributePolicy/1.0/rsyslogConf.st