Upgraded to buildout 2.x. Upgraded known good set (KGS) of versions.