Merge branch 'prerun_command' into gentoo

Conflicts:
	manifests/init.pp
	manifests/params.pp