This is a back port to 4.1, and the conflicts are partly a result of the
non inclusion of 656982a5 in 4.1.

(Back port by Pål Hermunn Johansen, hermunn@varnish-software.com)

Conflicts:
	bin/varnishd/cache/cache_pool.c
	bin/varnishd/cache/cache_wrk.c