Fixes #4644: Cannot upgrade from 2.9.2 to 2.9.4 due to an error on '/etc/logrotate.d/rudder'
Fixes #5542: correct most size undetection by fusion inventory - branch 2.6
Fixes #5545: Update strict dependency on ncf in rudder-techniques to now due to bug 5543
Merge pull request #484 from Kegeruneku/bug_5545/int/5545_update_ncf_dependency

Fixes #5545: Update strict dependency on ncf in rudder-techniques to now...
Merge pull request #483 from ncharles/bug_5542/int/size_of_drive

Fixes #5542: correct most size undetection by fusion inventory - branch ...
Merge pull request #485 from jooooooon/bug_4644/cannot_upgrade_from_2_9_2_to_2_9_4_due_to_an_error_on_etc_logrotate_d_rudder

OK for me, merging!
Merging 2.6 to 2.10, and removing invalid pattch files
Fixes #4197: correct most size undetection by fusion inventory
Merge pull request #482 from ncharles/bug_4197/int/correct_size_storage_detection

Fixes #4197: correct most size undetection by fusion inventory
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SOURCES/Makefile
	rudder-server-root/debian/postinst
Refs #4644: Added commit a5fec0d5941792e6b583d0e462e65a1bbd672f0c again after merge quirk
Fixes #5488: Limit runlogs size
Merge pull request #487 from peckpeck/bug_5488/limit_runlogs_size

Fixes #5488: Limit runlogs size
Revert "Fixes #5488: Limit runlogs size"

This reverts commit 71ee0ad6873fd322f17dd22f329e35b9abe83cea.
Fixes #5488: Do not write into cf3.[hostname].runlog files used for debug or CFEngine Enterprise edition
Merge pull request #488 from peckpeck/bug_5488/do_not_write_into_cf3_hostname_runlog_files_used_for_debug_or_cfengine_enterprise_edition

Fixes #5488: Do not write into cf3.[hostname].runlog files used for debu...
Fixes #5160: Make the packaging Apache 2.4 compliant
Fixes #5591: Copy rpmvercmp as part of the necessary CFEngine system binaries
Merge pull request #494 from Kegeruneku/ust_5183/int/5160_package_apache_24_compatible_vhosts_and_config

Fixes #5160: Make the packaging Apache 2.4 compliant
Merge pull request #496 from Kegeruneku/ust_5587/int/5591_package_rpmvercmp_properly

Fixes #5591: Copy rpmvercmp as part of the necessary CFEngine system bin...