Rudder

Seems OK to me. Besides, these modifications came from the cfengine_stdlib

For more details, see: http://askubuntu.com/questions/104899/make-apt-get-or-aptitude-run-with-y-but-not-prompt-for-replacement-of-configu

You are right, it should totally be consistent. The stdlib uses a -q, so I will add it. It must be a copy paste glitch ...

OK, this looks good.

But, PLEASE do not commit the same change to several branches! Ever. Your role, as a developer on this project, is to commit a bug fix to the earliest branch affected by the issue. We have automatic tools to merge fixed "upwards" to other branches. Having multiple commits make the code review task a lot harder, and makes tracking the commit later on difficult, since we basically have 3 duplicate commits (this is equivalent to duplicating code, in that it is not DRY).