Improved test coverage for test_migration
Merge branch 'master' of github.com:plone/plone.app.contenttypes

Conflicts:
	plone/app/contenttypes/tests/test_migration.py