Merge branch 'revert-profile-split'

Conflicts:
	plone/app/contenttypes/migration/browser.py
	plone/app/contenttypes/migration/utils.py
	plone/app/contenttypes/profiles.zcml
	plone/app/contenttypes/profiles/core/metadata.xml
remove tests
fix test