Fix template deprecation warnings generated in puppet 3
Merge branch 'fix-template-deprecations'

Conflicts:
	templates/passenger-vhost.erb