New buildout 2.2.0 bootstrap and fixed coverage buildout