Update buildout bootstrap and use the same for Python 2 and 3