Fixes #3236 : fixes sshConfiguration technique convention
Refs #3236 : improve the use of convention in the ssh technique
Fixes #3236 : improves the uses of conventions in the ssh technique
Refs #3236: remove unused parameters
Fixes #3555: avoid class name collision on 'cant_send_inventory' class
Merge pull request #109 from Kegeruneku/bug_3555/avoid_class_name_collission_on_cant_send_inventory

Fixes #3555: avoid class name collision on 'cant_send_inventory' class
Fixes #3461: Use the new passwordhashes in userManagement and edit /etc/shadow directly
Fixes #3562: Fix checkGenericFileContent (Failed merge)
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	initial-promises/node-server/distributePolicy/1.0/propagatePromises.cf
	techniques/system/distributePolicy/1.0/propagatePromises.st
Merge pull request #111 from Kegeruneku/bug_3562/dev/3562_correct_checkgenericfilecontent_technique

Fixes #3562: Fix checkGenericFileContent (Failed merge)
Merge pull request #110 from Kegeruneku/bug_3461/dev/3461_use_the_new_password_hashes_in_rudder

Fixes #3461: Use the new passwordhashes in userManagement and edit /etc/...
Fixes #3481: always_touch_update_file_on_root_server
Merge pull request #113 from jooooooon/bug_3481/always_touch_update_file_on_root_server

Fixes #3481: always_touch_update_file_on_root_server
Fixes #3564: Remove Tokyocabinet db file if broken
Fixes #3561: rework cron process name regex to not use beginning anchors
Merge pull request #117 from jooooooon/bug_3561/dev/3561_use_non_anchored_cron_paths_at_start_of_regex

Fixes #3561: rework cron process name regex to not use beginning anchors
Merge pull request #116 from Kegeruneku/bug_3564/dev/3564_adjust_cflock_checking_to_tokyocabinet_db

Fixes #3564: Remove Tokyocabinet db file if broken
Fixes #3397: redirect psql password check to stderr since we read the return code
Merge pull request #118 from jooooooon/bug_3397/avoid_stderr_on_check_known_to_fail

Fixes #3397: redirect psql password check to stderr since we read the re...