Also fixed some spurious failures in the bootstrap test.


git-svn-id: http://svn.zope.org/repos/main/zc.buildout/trunk@101154 62d5b8a3-27da-0310-9561-8e5933582275