Refactor class param handling
Merge remote branch 'upstream/master'

Conflicts:
	.gitignore
	manifests/client.pp
	manifests/client/install.pp
	manifests/globals.pp
	manifests/params.pp
	manifests/server.pp
	manifests/server/service.pp
Merge remote branch 'params/master' into merge_testing

Conflicts:
	manifests/server.pp
	manifests/server/install.pp
	spec/classes/server_install_spec.rb