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).

This prevent to upload the same URL multiple time in shacache with different
md5sum.

Keep the cloudooo revision fix to prevent inconsistent test result outcomes
during the cloudooo development. This revision adopted is the same as last
stable report for erp5 and cloudooo test reports.

This file is used by cloudooo and erp5 setup. For not they are not
compatible yet.

pdftk and dirname are required by CloudOOo.

By using cloudooo directly from git we do not use fixed versions anymore.

Install cloudooo from git mainstream (like erp5) instead rely on
eggs for this. This makes development and testing faster by adoptiong
mainstream always.

Unify the standalone setup and the setup into erp5 to provide the same
outcome and reduce maintenace.

Update cloudooo configuration to make it compatible with erp5testnode and
permit re-enable continuous integration.

env-PATH is required for use imagemagick, ffmpeg from the instance itself,
and also important to make the tests works.

The slapos default configuration decision:
- text/html does not have Last-Modified
  Because we can not calculate proper last-modified date when the page consists
  of several parts. (e.g.: Gadgets)
- resouces have 'Cache-Control: public'
  Because several versions of Firefox request 'public' to cache resources
  over SSL.
So web_checker.cfg respects the slapos default configuration decision.

Like this testSpellChecking will stop using the aspell coming from
operating system and wich does not always comes with appropriate
dictionaries

Keep accessing software-url early, in case it was originally done to fail
before trying to connect if this mandatory parameter is missing.

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).

- Cache-Control:public,max-age= is also a valid configuration.
- application/font resources do not need to care about Vary header.

reason:
 - Expires header is widely supported than max-age. e.g.: HTTP/1.0 clients.
 - max-age directive always overrides Expires setting under HTTP/1.1,
   so there is no need to remove Expires here.

so that varnish recipe can be used without webchecker.

(cherry picked from commit c060818b385d8af429725fb9c53fdb8068ad21d5)