See merge request nexedi/slapos.buildout!36
and merge request nexedi/slapos.buildout!34

- Fixup "[feat] zc.recipe.egg: Support on the fly patches."