Changing passenger conf cert path from $fqdn to $server
Merge branch 'master' of https://github.com/Freeaqingme/puppet-puppet into Freeaqingme-master

Conflicts:
	templates/passenger/puppet-passenger.conf.erb