Refs #3929; work in progress for migration fixes

git-svn-id: https://svn.eionet.europa.eu/repositories/Naaya/trunk/eggs@21233 a0171fae-0946-0410-966d-b1775066cd26