Fixes #6000: Error output on Time settings at first run
Fixes #6015: Check ntp.conf exists before installing it - port of fix for #6000 to technique version 3.0
Merge pull request #616 from jooooooon/bug_6000/error_output_on_time_settings_at_first_run

Fixes #6000: Error output on Time settings at first run
Merge pull request #617 from jooooooon/bug_6015/check_ntp_conf_exists_before_installing_it_port_of_fix_for_6000_to_technique_version_3_0

Fixes #6015: Check ntp.conf exists before installing it - port of fix fo...
Fixes #5930: Correct bad merge on sshKeyDistribution that prevented it to edit the file
Merge pull request #618 from ncharles/bug_5930/dev/ssh_key_distribution

Fixes #5930: Correct bad merge on sshKeyDistribution that prevented it t...
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0