This is a cherry-pick of 3271c51e that
fixed the issue for Varnish 3.0 since it wasn't a problem in the 4.1
series then. This is only a back-port of the regression test since the
referenced commits already fixed the regression.

Refs 5e4d6c84
Refs 9f422620
Refs #2069