Functional testing is named correctly.....
Merge branch 'use-plone.app.testing' of git://github.com/plone/Products.CMFPlone into use-plone.app.testing

Conflicts:
	Products/CMFPlone/tests/CMFPloneTestCase.py