Upgrade git stable branch to use new buildout infrastructure