Make sure we test both getting and settings the site control panel adapter settings.
Remove unused imports.
Merge branch 'master' of git://github.com/plone/Products.CMFPlone