Fixes #3488 : correct reporting of the promises update phase
Fixes #3438: Corrected the cronConfiguration PT to use the correct cron binary path on Ubuntu
Fixes #3438: Corrected the cronConfiguration PT to use the correct cron binary path on Ubuntu (small fix)
Fixes #3438: Corrected the cronConfiguration PT to use the correct cron binary path on Ubuntu (small fix again)
Merge pull request #99 from Kegeruneku/bug_3438/dev/3438_correct_cron_configuration_technique_on_ubuntu

Bug 3438/dev/3438 correct cron configuration technique on ubuntu
Merge pull request #94 from ncharles/bug_3488/dev/correct_reporting_for_update

Fixes #3488 : correct reporting of the promises update phase
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	techniques/systemSettings/systemManagement/cronManagement/1.0/cronConfiguration.st
Merge branch 'branches/rudder/2.5' of github.com:Normation/rudder-techniques into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	techniques/system/common/1.0/promises.st
	techniques/system/common/1.0/update.st