dest folder handling
Merge branch 'master' into elektra-plone25

Conflicts:
	zopyx/plone/migration/importer.py