param update
Merge branch 'master' into rspec

Conflicts:
	manifests/init.pp