Minor commits before merge to public
Merge pull request #242 from deb-cfengine/install4

Minor commits before merge to public