Fixes #5590: don't make enterprise client suicide itself
Fixes #5600: Remove remaining () in techniques
Fixes #5601: Remove remaining () in techniques
Merge pull request #522 from peckpeck/bug_5601/remove_remaining_in_techniques

Fixes #5601: Remove remaining () in techniques
Merge pull request #521 from peckpeck/bug_5600/remove_remaining_in_techniques

Fixes #5600: Remove remaining () in techniques
Fixes #5603: Remove placeholder file from new directories
Merge pull request #523 from peckpeck/bug_5603/remove_placeholder_file_from_new_directories

Fixes #5603: Remove placeholder file from new directories
Fixes #5309: We need a script to check ordering in techniques
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10

Conflicts:
	initial-promises/node-server/common/1.0/rudder_lib.cf
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Ref #3846: initial commit for technique
Fixes #3846: Handle gid/uid at user creation (Technique usermanagement)
Fixes #5608: corretly update packages with rpmPackageInstallation on redhat
Remove & as a forbidden character
Merge pull request #529 from coredumb/ust_5605/dev/5606/genericvariables_do_not_forbid_and_character

Fixes #5606: Remove & as a forbidden character
Merge pull request #514 from ncharles/bug_5590/dev/don_t_suicide_enterprise

Fixes #5590: don't make enterprise client suicide itself
Merge pull request #465 from peckpeck/UST_3844/dev/3846_handle_uid_gid_at_user_creation

Ust 3844/dev/3846 handle uid gid at user creation
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #5429: remove use of curl proxy on Windows