Add tests for vocabularies used for the migration
Merge branch 'migration_form' into add-vocab-tests

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