Added patch to varnish in the makefile and ensure that configuration is set
Merge remote-tracking branch 'origin' into release