Cosmetic changes to imports (ala plone.api conventions)
Merge branch 'author_refactor_cleanup' of git://github.com/plone/Products.CMFPlone into author_refactor_cleanup