A bunch of upstream changes to versions and the buildout files