Fixes #4882: Do not duplicate network interface entries in fusion reports on AIX
Merge pull request #325 from Kegeruneku/bug_4882/int/4882_fix_duplicated_network_entries_in_fusion

Fixes #4882: Do not duplicate network interface entries in fusion report...
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-agent/SOURCES/Makefile
Fixes #4908: Source /etc/profile in check-rudder-agent before running
Refs #4613: correct indent of method
Fixes #4910: Create the rudder-node package (fusion-less rudder agent package, cleaned up)
Merge pull request #332 from Kegeruneku/ust_4740/int/4910_create_rudder_node_package

Fixes #4910: Create the rudder-node package (fusion-less rudder agent pa...
Merge pull request #330 from Kegeruneku/bug_4908/int/4908_source_etc_profile_in_check_rudder_agent

Fixes #4908: Source /etc/profile in check-rudder-agent before running
Fixes #4613: prevent multiple cf-execd from running
Merge pull request #331 from ncharles/bug_4613/dev/prevent_duplicate_cf-execd

Bug 4613/dev/prevent duplicate cf execd
Merging 2.6 into 2.9 for check_rudder_agent (Refs #4613)
Revert "Fixes #4910: Create the rudder-node package (fusion-less rudder agent package, cleaned up)"

This reverts commit 807e87efa48e370d3d43ca177f6aa3cbbc1323f5.

This package does not meet QA requirements, reverting.
Fixes #4916: Use autogen.sh on rudder-agent cfengine compilation when no configure script is usable
Merge pull request #333 from Kegeruneku/bug_4916/int/4916_use_autogen_on_rudder_agent_if_needed

Fixes #4916: Use autogen.sh on rudder-agent cfengine compilation when no...
Fixes #4832: Add migration script to change the ids in database
Merge pull request #319 from ncharles/bug_4832/int/migration_script_for_bigint

Fixes #4832: Add migration script to change the ids in database
Fixes #4920: Correct calls to /etc/init.d/jetty in rudder-webapp to use rudder-jetty instead
Merge pull request #334 from Kegeruneku/bug_4920/int/4920_fix_jetty_initd_reference_in_rudder_webapp

Fixes #4920: Correct calls to /etc/init.d/jetty in rudder-webapp to use ...
Fixes #4884: Remove rudder-slapd LSB dependency from rudder-jetty init script
Merge pull request #335 from Kegeruneku/bug_4884/int/4884_remove_rudder_slapd_lsb_dependency_from_rudder_jetty_init_script

Fixes #4884: Remove rudder-slapd LSB dependency from rudder-jetty init s...