Revert a8ea159e and unbreak Varnish 4 on EL6, and also handle the Ubuntu case
Revert a8ea159e and unbreak Varnish 4 on EL6, and also handle the Ubuntu case

Kaplan-Australia/puppet-varnish,Kaplan-Australia/puppet-varnish,dougneal/puppet-varnish,craigwatson/puppet-varnish,BashtonLtd/puppet-varnish,dougneal/puppet-varnish,BashtonLtd/puppet-varnish,craigwatson/puppet-varnish