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.