Remove obsolete test
Remove unused code
Merge branch 'issue-8856-buildout-support' into develop