Also adapt the bootstrap to buildout3.
This will create a new commit in order to revert the existing changes.