This reverts commit 72acaad9.

This reverts commit 1ea46ea8.

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

add inotifix explicitly in eggs target of stack/erp5 so that generated python2.6 script can load slapos.cookbook.

Decreasing tic interval increase reativity in case of few nodes.

Forcing modification of ERP5 internal configuration is not trustable for
production system (where custom configuration may have been applied by
administrator).

Instead, use erp5_promise bt5 which warn the administrator that the
configuration is not the expected one.

This settings seems commited twice in the same instant. See below:
http://git.erp5.org/gitweb/slapos.git/commitdiff/91c5be126a31c815407df1b2b2d5507cb6266bdd
http://git.erp5.org/gitweb/slapos.git/commitdiff/93ed854318acd93c1e735094d77a7b4b1c9bf82d

If present it will be used instead of /

It can be formatted with %(site-id)s in order to put site id there.