Those sections already exist in extended instance-zope.cfg .

We are never supposed to merge anything. We are supposed to just follow
upstream. pull merges, so it's just the wrong tool.
Instead, fetch and reset.
It is not a problem to always reset, as user already cannot rely on
repository's survival across updates: if there is any error reported by
git command, the repository will be wiped out. So resetting will not do
any more harm than what can already happen.
Also, properly quote paths to protect against spaces (in both command and
update-command).

so that varnish recipe can be used without webchecker.

The librsvg contains rsvg-convert, the command used by imagemagic
to convert svg to png.

Make varnish recipe use 3.0.x version varnish.

Download tidstorage and cloudooo templates during slapgrid-sr rather than
during slapgrid-cp.

Acked-by: Rafael Monnerat <rafael@nexedi.com>

This reverts commit 1ea46ea8.

Don't use squash because in this way we will lost the history.