update buildout infrastructure
cleanup, use functional, where commits are involved
fix siteadmin role test to not use ancient test frameworks and FIX plone 4.x test compatibility on this branch.
Merge branch 'master' into plip13476-mockup