Updating with recent upstream changes to varnishkafka.conf

Change-Id: Id856d1f9a2cbc1bb6f22dc7bd95c2df950a10976