Merge remote-tracking branch 'origin/hsmaster' into hsmaster_new

Conflicts:
	manifests/init.pp
	manifests/params.pp
	templates/redis.rhel.conf.erb