Default to the default buildout settings in test.ini
Merge remote-tracking branch 'origin/develop' into develop