fix
Merge branch 'iwm' of https://github.com/zopyx/zopyx.plone.migration into iwm

Conflicts:
	zopyx/plone/migration/importer.py