Update to zc buildout v2