Refresh Apache vhost from Puppet upstream, tighten SSL protocols

Conflicts:

	templates/server/puppet-vhost.conf.erb