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