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 #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