Applied fixes to 3.0 -> 3.2 migration code
Merge pull request #849 from Zentyal/cperello/migration-fixes

Applied fixes to 3.0 -> 3.2 migration code