[master] cf7304c64 Merge HAproxy support from vtest

[Poul-Henning Kamp]

--------
Dridi Boukelmoune writes:

> This is undoing some of the fixes from Nils that should have been
> merged the other way around too.

I know, my fault:  I forgot to merge this from VTEST to varnish
cache when it happened.

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk at FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.