Merge branch 'prerun_command' into pebkac

Conflicts:
	manifests/params.pp