Syncing the builout.cfg with upstream
Turning on i18n by default, and removing some empty directories.
The upgrade will require buildout.cfg, instance.cfg and versions.cfg, but not zope*cfg