Fixes #5327: prevent the always repaired state for fstab configuration on Rudder 2.11 and more
Fixes #5588: correct handling of inventory on windows
Merge pull request #516 from ncharles/bug_5588/dev/inventory_on_windows

Fixes #5588: correct handling of inventory on windows
Fixes #5547: Rewrite system techniques to use normal ordering on 2.6
Merge pull request #509 from ncharles/bug_5327/dev/corect_reporting_on_fstab

Fixes #5327: prevent the always repaired state for fstab configuration o...
Refs #5446: Rewrite techniques to use only ${}
Merge pull request #499 from peckpeck/bug_5547/rewrite_system_techniques_to_use_normal_ordering_on_2_6

Bug 5547/rewrite system techniques to use normal ordering on 2 6
Merge branch 'branches/rudder/2.6' into branches/rudder/2.10
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflict with 2 curl lines, took the NCH one.

Conflicts:
	initial-promises/node-server/inventory/1.0/fusionAgent.cf
Fixes #5548: Rewrite system techniques to use normal ordering on 2.10
Refs #5446: Rewrite techniques to use only ${}
Merge pull request #500 from peckpeck/bug_5548/rewrite_system_techniques_to_use_normal_ordering_on_2_10

Bug 5548/rewrite system techniques to use normal ordering on 2 10
Reindent and merge
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Fixes #5549: Rewrite system techniques to use normal ordering on 2.11
Refs #5446: Rewrite techniques to use only ${}
Merge pull request #501 from peckpeck/bug_5549/rewrite_system_techniques_to_use_normal_ordering_on_2_11

Bug 5549/rewrite system techniques to use normal ordering on 2 11
Reindent and merge
Fixes #5595: Use rpmvercmp or dpkg to do version comparison when needed
Merge pull request #518 from Kegeruneku/ust_5587/dev/5595_use_rpmvercmp_or_dpkg_to_do_version_comparison

Fixes #5595: Use rpmvercmp or dpkg to do version comparison when needed
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11