Fixes #4745: cfengine 3.6 complains about a typo.
Merge pull request #341 from VinceMacBuche/typo

Fixes #4745: cfengine 3.6 complains about a typo.
Fixes #4741: Android support for rudder 2.10
Merge pull request #342 from VinceMacBuche/android_support_2.10

Fixes #4741: Android support for rudder 2.10
Merge branch 'branches/rudder/2.9' into branches/rudder/2.10