Refs #4613: correct indent of method
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)
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 #4923: remove invali <<<<< from merge 2.6 -> 2.9 (Refs #4613)
Merge pull request #336 from ncharles/bug_4923/int/correct_merge_of_check_rudder_agent

Bug 4923/int/correct merge of check rudder agent
Merging 2.9 into 2.10
Fixes #4925: remove echo -n from check-rudder-agent methwqod check_and_fix_cf_lock uses
Merge pull request #337 from ncharles/bug_4925/int/remove_echo_n_in_check_rudder_agent

Bug 4925/int/remove echo n in check rudder agent
Fixes #4915: Force existence of policy_server.dat file
Merge pull request #338 from ncharles/bug_4915/int/force_existance_of_policy_server_dat

Fixes #4915: Force existence of policy_server.dat file
Merge branch 'branches/rudder/2.6' into branches/rudder/2.9
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10