Fix duplicate header imports in our VCL

Varnish doesn't allow duplicate imports, so this moves the ones
from geoip and zero for "header" into the top-level (in the
submodule update included here: varnish -> e6b6bae27)

Change-Id: Ibe45b47218c633973c8d3bcdb209346944955876