Fix test failures in recent merge.
Ignore buildout artifacts.