Rudder

#6587 introduced a patch for cfengine in 2.10 that was upmerged

#6590 introduced the same patch for 2.11.

So here we end up with two patches in 2.11 (and upper), that do the same things:

What should have been done:

First fix #6587, and merge it in 2.10
Upmerge it ( 2.10 -> 2.11) 
Fix #6590 by moving the patch file from #6587 and adapt it (git mv + edit ) 
Merge it in 2.11
Upmerge to 3.0 and beyond

Here we have to make a new issue to remove the wrong patch and that makes me sad :(

Alexis can you look at this please ? :)

a 'git rm' on the 2.10 patch should be enough :)