from the top down.

Conflicts:
	bin/varnishd/cache/cache_req_fsm.c

The conflict was just the result of cherry-picking changes out of order,
nothing to be worried about.