This was done in order to avoid copy-pasta, and to be
used in coming slapos.recipe.wrapper recipe.

Merge branch 'slapos'

Conflicts:
	component/slapos/buildout.cfg

(cherry picked from commit 3143874b)

(cherry picked from commit d1e1a328)

Remove busybox dirty hack since the workarounded problem is
fixed in new version.