Update to latest bootstrap.py to fix issues with latest (2.2.5) zc.buildout.