enforce target name
fix for new staging behavior
update again
fix refresh_only issue
Merge commit '15c5b379ba6d051d2792edd7cc'

Conflicts:
	manifests/7zip.pp
	manifests/init.pp