Upgrade to zc.buildout 1.7