Fixes #5944: Correct a broken merge ( <<<<<< HEAD tags found in merged file )
Merge pull request #558 from Kegeruneku/bug_5944/int/5944_correct_broken_merge

Fixes #5944: Correct a broken merge ( <<<<<< HEAD tags found in merged f...
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0