Conflicts:
	component/apache-php/buildout.cfg
	component/git/buildout.cfg
	component/mariadb/buildout.cfg
	slapos/recipe/request.py
	software/drupal/instance.cfg
	stack/lamp/buildout.cfg
	stack/nbd.cfg

Also, stop referencing reference implicitly pulled parts.

ERP5 related test locations can be calculated by eggs:extra-paths, instead of globbing from all parts.

Parameters are not final yet, and must evolve to get something resilient to
frontend "movements" (ex: frontend machine dying and frontend being
re-allocated on another, or frontend being replaced by an instance from
another software release - as it will happen for upgrades).

Modifed from original version by Rafael in order to fix conflicts
on md5 of the files and changes on same file done in multiple branches.

Fix 4b5c94ed

Conflicts:
	slapos/recipe/request.py

Frontend may be provided by another software release.

Password is stored in plaintext on the file system.

Mac address is now stored in plaintext on the file system.